Skip to content

Commit 4e4e402

Browse files
jackorpjackorp
committed
Update 3.3 references to 4.0.
1 parent 4153c6d commit 4e4e402

7 files changed

Lines changed: 33 additions & 39 deletions

File tree

‎4.0/Dockerfile.c10s‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ FROM quay.io/sclorg/s2i-base-c10s:c10s
55

66
EXPOSE 8080
77

8-
ENV RUBY_MAJOR_VERSION=3 \
9-
RUBY_MINOR_VERSION=3
8+
ENV RUBY_MAJOR_VERSION=4 \
9+
RUBY_MINOR_VERSION=0
1010

1111
ENV RUBY_VERSION="${RUBY_MAJOR_VERSION}.${RUBY_MINOR_VERSION}" \
1212
RUBY_SCL_NAME_VERSION="${RUBY_MAJOR_VERSION}${RUBY_MINOR_VERSION}"
@@ -36,17 +36,14 @@ LABEL summary="$SUMMARY" \
3636

3737
RUN INSTALL_PKGS=" \
3838
libffi-devel \
39-
ruby \
40-
ruby-devel \
41-
rubygem-rake \
42-
rubygem-bundler \
43-
ruby-bundled-gems \
39+
ruby4.0 \
40+
ruby4.0-devel \
4441
redhat-rpm-config \
4542
" && \
4643
dnf install -y --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
4744
dnf reinstall -y --setopt=tsflags=nodocs tzdata && \
4845
dnf -y clean all --enablerepo='*' && \
49-
ruby -v | grep -qe "^ruby $RUBY_VERSION\." && echo "Found VERSION $RUBY_VERSION" && \
46+
ruby4.0 -v | grep -qe "^ruby $RUBY_VERSION\." && echo "Found VERSION $RUBY_VERSION" && \
5047
rpm -V ${INSTALL_PKGS}
5148

5249
# Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH

‎4.0/Dockerfile.c9s‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ FROM quay.io/sclorg/s2i-base-c9s:c9s
55

66
EXPOSE 8080
77

8-
ENV RUBY_MAJOR_VERSION=3 \
9-
RUBY_MINOR_VERSION=3
8+
ENV RUBY_MAJOR_VERSION=4 \
9+
RUBY_MINOR_VERSION=0
1010

1111
ENV RUBY_VERSION="${RUBY_MAJOR_VERSION}.${RUBY_MINOR_VERSION}" \
1212
RUBY_SCL_NAME_VERSION="${RUBY_MAJOR_VERSION}${RUBY_MINOR_VERSION}"

‎4.0/Dockerfile.fedora‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ FROM quay.io/fedora/s2i-base:40
66
EXPOSE 8080
77

88
ENV NAME=ruby \
9-
RUBY_VERSION=3.3 \
10-
RUBY_SHORT_VER=33 \
9+
RUBY_VERSION=4.0 \
10+
RUBY_SHORT_VER=40 \
1111
VERSION=
1212

1313
ENV SUMMARY="Platform for building and running Ruby $RUBY_VERSION applications" \

‎4.0/Dockerfile.rhel10‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ FROM ubi10/s2i-base
55

66
EXPOSE 8080
77

8-
ENV RUBY_MAJOR_VERSION=3 \
9-
RUBY_MINOR_VERSION=3
8+
ENV RUBY_MAJOR_VERSION=4 \
9+
RUBY_MINOR_VERSION=0
1010

1111
ENV RUBY_VERSION="${RUBY_MAJOR_VERSION}.${RUBY_MINOR_VERSION}" \
1212
RUBY_SCL_NAME_VERSION="${RUBY_MAJOR_VERSION}${RUBY_MINOR_VERSION}"
@@ -35,17 +35,14 @@ LABEL summary="$SUMMARY" \
3535

3636
RUN INSTALL_PKGS=" \
3737
libffi-devel \
38-
ruby \
39-
ruby-devel \
40-
rubygem-rake \
41-
rubygem-bundler \
42-
ruby-bundled-gems \
38+
ruby4.0 \
39+
ruby4.0-devel \
4340
redhat-rpm-config \
4441
" && \
4542
dnf install -y --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
4643
dnf reinstall -y --setopt=tsflags=nodocs tzdata && \
4744
dnf -y clean all --enablerepo='*' && \
48-
ruby -v | grep -qe "^ruby $RUBY_VERSION\." && echo "Found VERSION $RUBY_VERSION" && \
45+
ruby4.0 -v | grep -qe "^ruby $RUBY_VERSION\." && echo "Found VERSION $RUBY_VERSION" && \
4946
rpm -V ${INSTALL_PKGS}
5047

5148
# Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH

‎4.0/Dockerfile.rhel9‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ FROM ubi9/s2i-base
55

66
EXPOSE 8080
77

8-
ENV RUBY_MAJOR_VERSION=3 \
9-
RUBY_MINOR_VERSION=3
8+
ENV RUBY_MAJOR_VERSION=4 \
9+
RUBY_MINOR_VERSION=0
1010

1111
ENV RUBY_VERSION="${RUBY_MAJOR_VERSION}.${RUBY_MINOR_VERSION}" \
1212
RUBY_SCL_NAME_VERSION="${RUBY_MAJOR_VERSION}${RUBY_MINOR_VERSION}"

‎4.0/README.md‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Ruby 3.3 container image
1+
Ruby 4.0 container image
22
========================
3-
This container image includes Ruby 3.3 as a [S2I](https://github.com/openshift/source-to-image) base image for your Ruby 3.3 applications.
3+
This container image includes Ruby 4.0 as a [S2I](https://github.com/openshift/source-to-image) base image for your Ruby 4.0 applications.
44
Users can choose between RHEL, CentOS Stream and Fedora based builder images.
55
The RHEL images are available in the [Red Hat Container Catalog](https://access.redhat.com/containers/),
66
the CentOS Stream images are available on [Quay.io](https://quay.io/organization/sclorg),
@@ -12,8 +12,8 @@ Note: while the examples in this README are calling `podman`, you can replace an
1212
Description
1313
-----------
1414

15-
Ruby 3.3 available as container is a base platform for
16-
building and running various Ruby 3.3 applications and frameworks.
15+
Ruby 4.0 available as container is a base platform for
16+
building and running various Ruby 4.0 applications and frameworks.
1717
Ruby is the interpreted scripting language for quick and easy object-oriented programming.
1818
It has many features to process text files and to do system management tasks (as in Perl).
1919
It is simple, straight-forward, and extensible.
@@ -25,12 +25,12 @@ the nodejs itself is included just to make the npm work.
2525

2626
Usage in Openshift
2727
------------------
28-
For this, we will assume that you are using the `ubi10/ruby-33 image`, available via `ruby:3.3` imagestream tag in Openshift.
29-
Building a simple [ruby-sample-app](https://github.com/sclorg/s2i-ruby-container/tree/master/3.3/test/puma-test-app) application
28+
For this, we will assume that you are using the `ubi10/ruby-40` image, available via `ruby:4.0` imagestream tag in Openshift.
29+
Building a simple [ruby-sample-app](https://github.com/sclorg/s2i-ruby-container/tree/master/4.0/test/puma-test-app) application
3030
in Openshift can be achieved with the following step:
3131

3232
```
33-
oc new-app ruby:3.3~https://github.com/sclorg/rails-ex.git
33+
oc new-app ruby:4.0~https://github.com/sclorg/rails-ex.git
3434
```
3535

3636
**Accessing the application:**
@@ -64,10 +64,10 @@ To use the Ruby image in a Dockerfile, follow these steps:
6464
#### 1. Pull a base builder image to build on
6565

6666
```
67-
podman pull ubi10/ruby-33
67+
podman pull ubi10/ruby-40
6868
```
6969

70-
An RHEL10 image `ubi10/ruby-33` is used in this example.
70+
An RHEL10 image `ubi10/ruby-40` is used in this example.
7171

7272
#### 2. Pull and application code
7373

@@ -85,11 +85,11 @@ This step usually consists of at least these parts:
8585
* installing the dependencies
8686
* setting the default command in the resulting image
8787

88-
For all these three parts, users can use the Source-to-Image scripts inside the image ([3.3.](#33-to-use-the-source-to-image-scripts-and-build-an-image-using-a-dockerfile-create-a-dockerfile-with-this-content)), or users can either setup all manually and use commands `ruby`, `bundle` and `rackup` explicitly in the Dockerfile ([3.3.](#33-to-use-your-own-setup-create-a-dockerfile-with-this-content))
88+
For all these three parts, users can use the Source-to-Image scripts inside the image ([4.0.](#33-to-use-the-source-to-image-scripts-and-build-an-image-using-a-dockerfile-create-a-dockerfile-with-this-content)), or users can either setup all manually and use commands `ruby`, `bundle` and `rackup` explicitly in the Dockerfile ([4.0.](#33-to-use-your-own-setup-create-a-dockerfile-with-this-content))
8989

90-
##### 3.3 To use the Source-to-Image scripts and build an image using a Dockerfile, create a Dockerfile with this content:
90+
##### 4.0 To use the Source-to-Image scripts and build an image using a Dockerfile, create a Dockerfile with this content:
9191
```
92-
FROM ubi10/ruby-33
92+
FROM ubi10/ruby-40
9393
9494
# Add application sources to a directory that the assemble scriptexpects them
9595
# and set permissions so that the container runs without root access
@@ -108,9 +108,9 @@ RUN /usr/libexec/s2i/assemble
108108
CMD /usr/libexec/s2i/run
109109
```
110110
The s2i scripts are used to set-up and run common Ruby applications. More information about the scripts can be found in [Source-to-Image](#source-to-image-framework-and-scripts) section.
111-
##### 3.3 To use your own setup, create a Dockerfile with this content:
111+
##### 4.0 To use your own setup, create a Dockerfile with this content:
112112
```
113-
FROM ubi10/ruby-33
113+
FROM ubi10/ruby-40
114114
115115
USER 0
116116
ADD app-src ./
@@ -225,5 +225,5 @@ See also
225225
--------
226226
Dockerfile and other sources are available on https://github.com/sclorg/s2i-ruby-container.
227227
In that repository you also can find another versions of Ruby environment Dockerfiles.
228-
The Dockerfile for RHEL8 is called `Dockerfile.rhel8`, for RHEL9 it's `Dockerfile.rhel9`,
229-
for RHEL10 it's `Dockerfile.rhel10`, for CentOS Stream 10 it's `Dockerfile.c10s` and the Fedora Dockerfile is called Dockerfile.fedora.
228+
The Dockerfile for RHEL9 is called `Dockerfile.rhel9`, for RHEL10 it's `Dockerfile.rhel10`,
229+
for CentOS Stream 10 it's `Dockerfile.c10s` and the Fedora Dockerfile is called `Dockerfile.fedora`.

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Variables are documented in common/build.sh.
22
BASE_IMAGE_NAME = ruby
3-
VERSIONS = 2.5 3.0 3.3
3+
VERSIONS = 2.5 3.0 3.3 4.0
44
OPENSHIFT_NAMESPACES = 2.0
55
CONU_IMAGE := docker.io/usercont/conu:0.6.2
66

0 commit comments

Comments
 (0)