United F40, C10S and C9S a couple bit more

as suggested by @hhorak. Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
sclorg · Jul 16, 2024 · 9e0ab10 · 9e0ab10
1 parent 9f954b6
commit 9e0ab10
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 22 deletions.
diff --git a/base/Dockerfile.c10s b/base/Dockerfile.c10s
@@ -7,15 +7,16 @@ builder images like perl, python, ruby, etc." \
 images layered on top of it with all the tools needed to use source-to-image \
 functionality. Additionally, s2i-base also contains various libraries needed for \
 it to serve as a base for other builder images, like s2i-python or s2i-ruby." \
-    NODEJS_VER=20
+    NODEJS_VER=20 \
+    NAME=s2i-base
 
 LABEL summary="$SUMMARY" \
       description="$DESCRIPTION" \
       io.k8s.description="$DESCRIPTION" \
       io.k8s.display-name="s2i base" \
-      com.redhat.component="s2i-base-container" \
-      name="sclorg/s2i-base-c10s" \
-      version="1" \
+      com.redhat.component="$NAME-container" \
+      name="sclorg/$NAME-c$VERSIONs" \
+      version="$VERSION" \
       maintainer="SoftwareCollections.org <sclorg@redhat.com>"
 
 # This is the list of basic dependencies that all language container image can
@@ -47,4 +48,4 @@ RUN INSTALL_PKGS="nodejs autoconf \
   dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
   rpm -V $INSTALL_PKGS && \
   node -v | grep -qe "^v$NODEJS_VER\." && echo "Found VERSION $NODEJS_VER" && \
-  yum -y clean all --enablerepo='*'
+  dnf -y clean all --enablerepo='*'
diff --git a/base/Dockerfile.c9s b/base/Dockerfile.c9s
@@ -7,15 +7,16 @@ builder images like perl, python, ruby, etc." \
 images layered on top of it with all the tools needed to use source-to-image \
 functionality. Additionally, s2i-base also contains various libraries needed for \
 it to serve as a base for other builder images, like s2i-python or s2i-ruby." \
-    NODEJS_VER=20
+    NODEJS_VER=20 \
+    NAME=s2i-base
 
 LABEL summary="$SUMMARY" \
       description="$DESCRIPTION" \
       io.k8s.description="$DESCRIPTION" \
       io.k8s.display-name="s2i base" \
-      com.redhat.component="s2i-base-container" \
-      name="sclorg/s2i-base-c9s" \
-      version="1" \
+      com.redhat.component="$NAME-container" \
+      name="sclorg/$NAME-c$VERSIONs" \
+      version="$VERSION" \
       maintainer="SoftwareCollections.org <sclorg@redhat.com>"
 
 # This is the list of basic dependencies that all language container image can

diff --git a/core/Dockerfile.c10s b/core/Dockerfile.c10s
@@ -4,17 +4,19 @@ FROM quay.io/centos/centos:stream10-development
 ENV SUMMARY="Base image which allows using of source-to-image."	\
     DESCRIPTION="The s2i-core image provides any images layered on top of it \
 with all the tools needed to use source-to-image functionality while keeping \
-the image size as small as possible."
+the image size as small as possible." \
+    NAME=s2i-core \
+    VERSION=10
 
 LABEL summary="$SUMMARY" \
       description="$DESCRIPTION" \
       io.k8s.description="$DESCRIPTION" \
       io.k8s.display-name="s2i core" \
       io.openshift.s2i.scripts-url=image:///usr/libexec/s2i \
       io.s2i.scripts-url=image:///usr/libexec/s2i \
-      com.redhat.component="s2i-core-container" \
-      name="sclorg/s2i-core-c10s" \
-      version="1" \
+      com.redhat.component="$NAME-container" \
+      name="sclorg/$NAME-c$VERSIONs" \
+      version="$VERSION" \
       maintainer="SoftwareCollections.org <sclorg@redhat.com>"
 
 ENV \
@@ -36,10 +38,10 @@ ENV \
 
 RUN INSTALL_PKGS="bsdtar \
   findutils \
+  gettext \
+  glibc-langpack-en \
   groff-base \
   glibc-locale-source \
-  glibc-langpack-en \
-  gettext \
   rsync \
   scl-utils \
   tar \
@@ -48,9 +50,9 @@ RUN INSTALL_PKGS="bsdtar \
   yum" && \
   mkdir -p ${HOME}/.pki/nssdb && \
   chown -R 1001:0 ${HOME}/.pki && \
-  yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
+  dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
   rpm -V $INSTALL_PKGS && \
-  yum -y clean all --enablerepo='*'
+  dnf -y clean all --enablerepo='*'
 
 # Copy extra files to the image.
 COPY ./core/root/ /

diff --git a/core/Dockerfile.c9s b/core/Dockerfile.c9s
@@ -4,7 +4,8 @@ FROM quay.io/centos/centos:stream9
 ENV SUMMARY="Base image which allows using of source-to-image."	\
     DESCRIPTION="The s2i-core image provides any images layered on top of it \
 with all the tools needed to use source-to-image functionality while keeping \
-the image size as small as possible."
+the image size as small as possible." \
+    VERSION=9
 
 LABEL summary="$SUMMARY" \
       description="$DESCRIPTION" \
@@ -36,10 +37,10 @@ ENV \
 
 RUN INSTALL_PKGS="bsdtar \
   findutils \
+  gettext \
+  glibc-langpack-en \
   groff-base \
   glibc-locale-source \
-  glibc-langpack-en \
-  gettext \
   rsync \
   scl-utils \
   tar \
@@ -48,9 +49,9 @@ RUN INSTALL_PKGS="bsdtar \
   yum" && \
   mkdir -p ${HOME}/.pki/nssdb && \
   chown -R 1001:0 ${HOME}/.pki && \
-  yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
+  dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
   rpm -V $INSTALL_PKGS && \
-  yum -y clean all --enablerepo='*'
+  dnf -y clean all --enablerepo='*'
 
 # Copy extra files to the image.
 COPY ./core/root/ /