Add Ruby 3.3: changes for Ruby 3.3

pvalena · pvalena · commit 6bff036d260b · 2024-02-12T20:47:27.000+01:00
(3 step/commit workflow to preserve history)
diff --git a/3.3/Dockerfile.c8s b/3.3/Dockerfile.c8s
@@ -0,0 +1,66 @@
+FROM quay.io/sclorg/s2i-base-c8s:c8s
+
+# This image provides a Ruby environment you can use to run your Ruby
+# applications.
+
+EXPOSE 8080
+
+ENV RUBY_MAJOR_VERSION=3 \
+    RUBY_MINOR_VERSION=3
+
+ENV RUBY_VERSION="${RUBY_MAJOR_VERSION}.${RUBY_MINOR_VERSION}" \
+    RUBY_SCL_NAME_VERSION="${RUBY_MAJOR_VERSION}${RUBY_MINOR_VERSION}"
+
+ENV RUBY_SCL="ruby-${RUBY_SCL_NAME_VERSION}" \
+    IMAGE_NAME="ubi8/ruby-${RUBY_SCL_NAME_VERSION}" \
+    SUMMARY="Platform for building and running Ruby $RUBY_VERSION applications" \
+    DESCRIPTION="Ruby $RUBY_VERSION available as container is a base platform for \
+building and running various Ruby $RUBY_VERSION applications and frameworks. \
+Ruby is the interpreted scripting language for quick and easy object-oriented programming. \
+It has many features to process text files and to do system management tasks (as in Perl). \
+It is simple, straight-forward, and extensible."
+
+LABEL summary="$SUMMARY" \
+      description="$DESCRIPTION" \
+      io.k8s.description="$DESCRIPTION" \
+      io.k8s.display-name="Ruby ${RUBY_VERSION}" \
+      io.openshift.expose-services="8080:http" \
+      io.openshift.tags="builder,ruby,ruby${RUBY_SCL_NAME_VERSION},${RUBY_SCL}" \
+      com.redhat.component="${RUBY_SCL}-container" \
+      name="${IMAGE_NAME}" \
+      version="1" \
+      com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \
+      usage="s2i build https://github.com/sclorg/s2i-ruby-container.git \
+--context-dir=${RUBY_VERSION}/test/puma-test-app/ ${IMAGE_NAME} ruby-sample-app" \
+      maintainer="SoftwareCollections.org <sclorg@redhat.com>"
+
+RUN yum -y module enable ruby:$RUBY_VERSION && \
+    INSTALL_PKGS=" \
+    libffi-devel \
+    ruby \
+    ruby-devel \
+    rubygem-rake \
+    rubygem-bundler \
+    ruby-bundled-gems \
+    redhat-rpm-config \
+    " && \
+    yum install -y --setopt=tsflags=nodocs ${INSTALL_PKGS} && \
+    yum reinstall -y --setopt=tsflags=nodocs tzdata && \
+    yum -y clean all --enablerepo='*' && \
+    ruby -v | grep -qe "^ruby $RUBY_VERSION\." && echo "Found VERSION $RUBY_VERSION" && \
+    rpm -V ${INSTALL_PKGS}
+
+# Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH
+COPY ./s2i/bin/ $STI_SCRIPTS_PATH
+
+# Copy extra files to the image.
+COPY ./root/ /
+
+# Drop the root user and make the content of /opt/app-root owned by user 1001
+RUN chown -R 1001:0 ${APP_ROOT} && chmod -R ug+rwx ${APP_ROOT} && \
+    rpm-file-permissions
+
+USER 1001
+
+# Set the default CMD to print the usage of the language image
+CMD $STI_SCRIPTS_PATH/usage
diff --git a/3.3/Dockerfile.c9s b/3.3/Dockerfile.c9s
@@ -6,7 +6,7 @@ FROM quay.io/sclorg/s2i-base-c9s:c9s
 EXPOSE 8080
 
 ENV RUBY_MAJOR_VERSION=3 \
-    RUBY_MINOR_VERSION=1
+    RUBY_MINOR_VERSION=3
 
 ENV RUBY_VERSION="${RUBY_MAJOR_VERSION}.${RUBY_MINOR_VERSION}" \
     RUBY_SCL_NAME_VERSION="${RUBY_MAJOR_VERSION}${RUBY_MINOR_VERSION}"
diff --git a/3.3/Dockerfile.fedora b/3.3/Dockerfile.fedora
@@ -1,13 +1,13 @@
-FROM quay.io/fedora/s2i-base:37
+FROM quay.io/fedora/s2i-base:39
 
 # This image provides a Ruby environment you can use to run your Ruby
 # applications.
 
 EXPOSE 8080
 
 ENV NAME=ruby \
-    RUBY_VERSION=3.1 \
-    RUBY_SHORT_VER=31 \
+    RUBY_VERSION=3.3 \
+    RUBY_SHORT_VER=33 \
     VERSION=0
 
 ENV SUMMARY="Platform for building and running Ruby $RUBY_VERSION applications" \
diff --git a/3.3/Dockerfile.rhel8 b/3.3/Dockerfile.rhel8
@@ -6,7 +6,7 @@ FROM ubi8/s2i-base
 EXPOSE 8080
 
 ENV RUBY_MAJOR_VERSION=3 \
-    RUBY_MINOR_VERSION=1
+    RUBY_MINOR_VERSION=3
 
 ENV RUBY_VERSION="${RUBY_MAJOR_VERSION}.${RUBY_MINOR_VERSION}" \
     RUBY_SCL_NAME_VERSION="${RUBY_MAJOR_VERSION}${RUBY_MINOR_VERSION}"
diff --git a/3.3/Dockerfile.rhel9 b/3.3/Dockerfile.rhel9
@@ -6,7 +6,7 @@ FROM ubi9/s2i-base
 EXPOSE 8080
 
 ENV RUBY_MAJOR_VERSION=3 \
-    RUBY_MINOR_VERSION=1
+    RUBY_MINOR_VERSION=3
 
 ENV RUBY_VERSION="${RUBY_MAJOR_VERSION}.${RUBY_MINOR_VERSION}" \
     RUBY_SCL_NAME_VERSION="${RUBY_MAJOR_VERSION}${RUBY_MINOR_VERSION}"
diff --git a/3.3/README.md b/3.3/README.md
@@ -1,6 +1,6 @@
-Ruby 3.1 container image
+Ruby 3.3 container image
 ========================
-This container image includes Ruby 3.1 as a [S2I](https://github.com/openshift/source-to-image) base image for your Ruby 3.1 applications.
+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.
 Users can choose between RHEL, CentOS and Fedora based builder images.
 The RHEL images are available in the [Red Hat Container Catalog](https://access.redhat.com/containers/),
 the CentOS images are available on [Quay.io](https://quay.io/organization/centos7),
@@ -12,8 +12,8 @@ Note: while the examples in this README are calling `podman`, you can replace an
 Description
 -----------
 
-Ruby 3.1 available as container is a base platform for
-building and running various Ruby 3.1 applications and frameworks.
+Ruby 3.3 available as container is a base platform for
+building and running various Ruby 3.3 applications and frameworks.
 Ruby is the interpreted scripting language for quick and easy object-oriented programming.
 It has many features to process text files and to do system management tasks (as in Perl).
 It is simple, straight-forward, and extensible.
@@ -25,12 +25,12 @@ the nodejs itself is included just to make the npm work.
 
 Usage in Openshift
 ------------------
-For this, we will assume that you are using the `ubi8/ruby-31 image`, available via `ruby:3.1` imagestream tag in Openshift.
-Building a simple [ruby-sample-app](https://github.com/sclorg/s2i-ruby-container/tree/master/3.1/test/puma-test-app) application
+For this, we will assume that you are using the `ubi8/ruby-33 image`, available via `ruby:3.3` imagestream tag in Openshift.
+Building a simple [ruby-sample-app](https://github.com/sclorg/s2i-ruby-container/tree/master/3.3/test/puma-test-app) application
 in Openshift can be achieved with the following step:
 
     ```
-    oc new-app ruby:3.1~https://github.com/sclorg/rails-ex.git
+    oc new-app ruby:3.3~https://github.com/sclorg/rails-ex.git
     ```
 
 **Accessing the application:**
@@ -64,10 +64,10 @@ To use the Ruby image in a Dockerfile, follow these steps:
 #### 1. Pull a base builder image to build on
 
 ```
-podman pull ubi8/ruby-31
+podman pull ubi8/ruby-33
 ```
 
-An RHEL8 image `ubi8/ruby-31` is used in this example.
+An RHEL8 image `ubi8/ruby-33` is used in this example.
 
 #### 2. Pull and application code
 
@@ -85,11 +85,11 @@ This step usually consists of at least these parts:
 * installing the dependencies
 * setting the default command in the resulting image
 
-For all these three parts, users can use the Source-to-Image scripts inside the image ([3.1.](#31-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.2.](#32-to-use-your-own-setup-create-a-dockerfile-with-this-content))
+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))
 
-##### 3.1 To use the Source-to-Image scripts and build an image using a Dockerfile, create a Dockerfile with this content:
+##### 3.3 To use the Source-to-Image scripts and build an image using a Dockerfile, create a Dockerfile with this content:
 ```
-FROM ubi8/ruby-31
+FROM ubi8/ruby-33
 
 # Add application sources to a directory that the assemble scriptexpects them
 # and set permissions so that the container runs without root access
@@ -108,9 +108,9 @@ RUN /usr/libexec/s2i/assemble
 CMD /usr/libexec/s2i/run
 ```
 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.
-##### 3.2 To use your own setup, create a Dockerfile with this content:
+##### 3.3 To use your own setup, create a Dockerfile with this content:
 ```
-FROM ubi8/ruby-31
+FROM ubi8/ruby-33
 
 USER 0
 ADD app-src ./
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # Variables are documented in common/build.sh.
 BASE_IMAGE_NAME = ruby
-VERSIONS = 2.5 3.0 3.1
+VERSIONS = 2.5 3.0 3.1 3.3
 OPENSHIFT_NAMESPACES = 2.0
 CONU_IMAGE := docker.io/usercont/conu:0.6.2
 
