Dist gen generation

22-minimal/Dockerfile.c8s

@@ -17,7 +17,7 @@ ENV APP_ROOT=/opt/app-root \
     HOME=/opt/app-root/src \
     NPM_RUN=start \
     PLATFORM="el8" \
-    NODEJS_VERSION=20 \
+    NODEJS_VERSION=22 \
     NPM_RUN=start \
     NAME=nodejs
 

22-minimal/s2i/bin/run

@@ -43,7 +43,7 @@ run_node() {
     echo "Launching via npm..."
     exec npm run -d $NPM_RUN
   fi
-} 
+}
 
 #Set the debug port to 5858 by default.
 if [ -z "$DEBUG_PORT" ]; then
@@ -76,4 +76,4 @@ fi
 #
 [ "$1" == "--debug" ] && exec /bin/bash
 
-run_node
+run_node

22/Dockerfile.c8s

@@ -16,12 +16,12 @@ EXPOSE 8080
 # Expose ports:
 # * 8080 - Unprivileged port used by nodejs application
 
-ENV NODEJS_VERSION=20 \
+ENV NODEJS_VERSION=22 \
     NPM_RUN=start \
     NAME=nodejs \
     NPM_CONFIG_PREFIX=$HOME/.npm-global \
     PATH=$HOME/node_modules/.bin/:$HOME/.npm-global/bin/:$PATH \
-    CNB_STACK_ID=com.redhat.stacks.c8s-nodejs-20 \
+    CNB_STACK_ID=com.redhat.stacks.c8s-nodejs-22 \
     CNB_USER_ID=1001 \
     CNB_GROUP_ID=0
 
@@ -41,7 +41,7 @@ LABEL summary="$SUMMARY" \
       io.openshift.tags="builder,$NAME,${NAME}${NODEJS_VERSION}" \
       io.openshift.s2i.scripts-url="image:///usr/libexec/s2i" \
       io.s2i.scripts-url="image:///usr/libexec/s2i" \
-      io.buildpacks.stack.id="com.redhat.stacks.c8s-nodejs-20" \
+      io.buildpacks.stack.id="com.redhat.stacks.c8s-nodejs-22" \
       com.redhat.dev-mode="DEV_MODE:false" \
       com.redhat.deployments-dir="${APP_ROOT}/src" \
       com.redhat.dev-mode.port="DEBUG_PORT:5858" \

22/Dockerfile.rhel8

@@ -21,7 +21,7 @@ ENV NODEJS_VERSION=22 \
     NAME=nodejs \
     NPM_CONFIG_PREFIX=$HOME/.npm-global \
     PATH=$HOME/node_modules/.bin/:$HOME/.npm-global/bin/:$PATH \
-    CNB_STACK_ID=com.redhat.stacks.ubi8-nodejs-20 \
+    CNB_STACK_ID=com.redhat.stacks.ubi8-nodejs-22 \
     CNB_USER_ID=1001 \
     CNB_GROUP_ID=0
 
@@ -41,7 +41,7 @@ LABEL summary="$SUMMARY" \
       io.openshift.tags="builder,$NAME,${NAME}${NODEJS_VERSION}" \
       io.openshift.s2i.scripts-url="image:///usr/libexec/s2i" \
       io.s2i.scripts-url="image:///usr/libexec/s2i" \
-      io.buildpacks.stack.id="com.redhat.stacks.ubi8-nodejs-20" \
+      io.buildpacks.stack.id="com.redhat.stacks.ubi8-nodejs-22" \
       com.redhat.dev-mode="DEV_MODE:false" \
       com.redhat.deployments-dir="${APP_ROOT}/src" \
       com.redhat.dev-mode.port="DEBUG_PORT:5858" \

22/Dockerfile.rhel9

@@ -21,7 +21,7 @@ ENV NODEJS_VERSION=22 \
     NAME=nodejs \
     NPM_CONFIG_PREFIX=$HOME/.npm-global \
     PATH=$HOME/node_modules/.bin/:$HOME/.npm-global/bin/:$PATH \
-    CNB_STACK_ID=com.redhat.stacks.ubi9-nodejs-20 \
+    CNB_STACK_ID=com.redhat.stacks.ubi9-nodejs-22 \
     CNB_USER_ID=1001 \
     CNB_GROUP_ID=0
 
@@ -41,7 +41,7 @@ LABEL summary="$SUMMARY" \
       io.openshift.tags="builder,$NAME,${NAME}${NODEJS_VERSION}" \
       io.openshift.s2i.scripts-url="image:///usr/libexec/s2i" \
       io.s2i.scripts-url="image:///usr/libexec/s2i" \
-      io.buildpacks.stack.id="com.redhat.stacks.ubi9-nodejs-20" \
+      io.buildpacks.stack.id="com.redhat.stacks.ubi9-nodejs-22" \
       com.redhat.dev-mode="DEV_MODE:false" \
       com.redhat.deployments-dir="${APP_ROOT}/src" \
       com.redhat.dev-mode.port="DEBUG_PORT:5858" \

22/s2i/bin/run

@@ -47,7 +47,7 @@ run_node() {
     echo "Launching via npm..."
     exec npm run -d $NPM_RUN
   fi
-} 
+}
 
 #Set the debug port to 5858 by default.
 if [ -z "$DEBUG_PORT" ]; then

22/test

@@ -1 +1 @@
-../test/
+../test

24-minimal/Dockerfile.c8s

@@ -17,7 +17,7 @@ ENV APP_ROOT=/opt/app-root \
     HOME=/opt/app-root/src \
     NPM_RUN=start \
     PLATFORM="el8" \
-    NODEJS_VERSION=20 \
+    NODEJS_VERSION=24 \
     NPM_RUN=start \
     NAME=nodejs
 

24-minimal/s2i/bin/run

@@ -43,7 +43,7 @@ run_node() {
     echo "Launching via npm..."
     exec npm run -d $NPM_RUN
   fi
-} 
+}
 
 #Set the debug port to 5858 by default.
 if [ -z "$DEBUG_PORT" ]; then
@@ -76,4 +76,4 @@ fi
 #
 [ "$1" == "--debug" ] && exec /bin/bash
 
-run_node
+run_node

24/Dockerfile.c8s

@@ -16,12 +16,12 @@ EXPOSE 8080
 # Expose ports:
 # * 8080 - Unprivileged port used by nodejs application
 
-ENV NODEJS_VERSION=20 \
+ENV NODEJS_VERSION=24 \
     NPM_RUN=start \
     NAME=nodejs \
     NPM_CONFIG_PREFIX=$HOME/.npm-global \
     PATH=$HOME/node_modules/.bin/:$HOME/.npm-global/bin/:$PATH \
-    CNB_STACK_ID=com.redhat.stacks.c8s-nodejs-20 \
+    CNB_STACK_ID=com.redhat.stacks.c8s-nodejs-24 \
     CNB_USER_ID=1001 \
     CNB_GROUP_ID=0
 
@@ -41,7 +41,7 @@ LABEL summary="$SUMMARY" \
       io.openshift.tags="builder,$NAME,${NAME}${NODEJS_VERSION}" \
       io.openshift.s2i.scripts-url="image:///usr/libexec/s2i" \
       io.s2i.scripts-url="image:///usr/libexec/s2i" \
-      io.buildpacks.stack.id="com.redhat.stacks.c8s-nodejs-20" \
+      io.buildpacks.stack.id="com.redhat.stacks.c8s-nodejs-24" \
       com.redhat.dev-mode="DEV_MODE:false" \
       com.redhat.deployments-dir="${APP_ROOT}/src" \
       com.redhat.dev-mode.port="DEBUG_PORT:5858" \

24/Dockerfile.rhel8

@@ -21,7 +21,7 @@ ENV NODEJS_VERSION=24 \
     NAME=nodejs \
     NPM_CONFIG_PREFIX=$HOME/.npm-global \
     PATH=$HOME/node_modules/.bin/:$HOME/.npm-global/bin/:$PATH \
-    CNB_STACK_ID=com.redhat.stacks.ubi8-nodejs-20 \
+    CNB_STACK_ID=com.redhat.stacks.ubi8-nodejs-24 \
     CNB_USER_ID=1001 \
     CNB_GROUP_ID=0
 
@@ -41,7 +41,7 @@ LABEL summary="$SUMMARY" \
       io.openshift.tags="builder,$NAME,${NAME}${NODEJS_VERSION}" \
       io.openshift.s2i.scripts-url="image:///usr/libexec/s2i" \
       io.s2i.scripts-url="image:///usr/libexec/s2i" \
-      io.buildpacks.stack.id="com.redhat.stacks.ubi8-nodejs-20" \
+      io.buildpacks.stack.id="com.redhat.stacks.ubi8-nodejs-24" \
       com.redhat.dev-mode="DEV_MODE:false" \
       com.redhat.deployments-dir="${APP_ROOT}/src" \
       com.redhat.dev-mode.port="DEBUG_PORT:5858" \

24/Dockerfile.rhel9

@@ -21,7 +21,7 @@ ENV NODEJS_VERSION=24 \
     NAME=nodejs \
     NPM_CONFIG_PREFIX=$HOME/.npm-global \
     PATH=$HOME/node_modules/.bin/:$HOME/.npm-global/bin/:$PATH \
-    CNB_STACK_ID=com.redhat.stacks.ubi9-nodejs-20 \
+    CNB_STACK_ID=com.redhat.stacks.ubi9-nodejs-24 \
     CNB_USER_ID=1001 \
     CNB_GROUP_ID=0
 
@@ -41,7 +41,7 @@ LABEL summary="$SUMMARY" \
       io.openshift.tags="builder,$NAME,${NAME}${NODEJS_VERSION}" \
       io.openshift.s2i.scripts-url="image:///usr/libexec/s2i" \
       io.s2i.scripts-url="image:///usr/libexec/s2i" \
-      io.buildpacks.stack.id="com.redhat.stacks.ubi9-nodejs-20" \
+      io.buildpacks.stack.id="com.redhat.stacks.ubi9-nodejs-24" \
       com.redhat.dev-mode="DEV_MODE:false" \
       com.redhat.deployments-dir="${APP_ROOT}/src" \
       com.redhat.dev-mode.port="DEBUG_PORT:5858" \

24/s2i/bin/run

@@ -47,7 +47,7 @@ run_node() {
     echo "Launching via npm..."
     exec npm run -d $NPM_RUN
   fi
-} 
+}
 
 #Set the debug port to 5858 by default.
 if [ -z "$DEBUG_PORT" ]; then

24/test

@@ -1 +1 @@
-../test/
+../test

manifest-minimal.yml

@@ -0,0 +1,126 @@
+# Manifest for image directories creation (minimal variants)
+# every dest path will be prefixed by $DESTDIR/$version
+
+# Files containing distgen directives, which are used for each
+# (distro, version) combination not excluded in multispec
+DISTGEN_MULTI_RULES:
+  - src: src/Dockerfile.minimal
+    dest: Dockerfile.rhel8
+
+  - src: src/Dockerfile.minimal
+    dest: Dockerfile.rhel9
+
+  - src: src/Dockerfile.minimal
+    dest: Dockerfile.rhel10
+
+  - src: src/Dockerfile.minimal
+    dest: Dockerfile.c8s
+
+  - src: src/Dockerfile.minimal
+    dest: Dockerfile.c9s
+
+  - src: src/Dockerfile.minimal
+    dest: Dockerfile.c10s
+
+  - src: src/Dockerfile.minimal.fedora
+    dest: Dockerfile.fedora
+
+# Files to generate once per version
+DISTGEN_RULES:
+  - src: src/README.minimal.md
+    dest: README.md
+
+# Files to copy
+COPY_RULES:
+  - src: src/s2i/bin/assemble
+    dest: s2i/bin/assemble
+    mode: "0755"
+
+  - src: src/s2i/bin/run-minimal
+    dest: s2i/bin/run
+    mode: "0755"
+
+  - src: src/s2i/bin/save-artifacts
+    dest: s2i/bin/save-artifacts
+    mode: "0755"
+
+  - src: src/s2i/bin/usage
+    dest: s2i/bin/usage
+    mode: "0755"
+
+  - src: src/s2i/bin/init-wrapper
+    dest: s2i/bin/init-wrapper
+    mode: "0755"
+
+  - src: src/root/usr/bin/fix-permissions
+    dest: root/usr/bin/fix-permissions
+    mode: "0755"
+
+# Symbolic links
+SYMLINK_RULES:
+  - src: ../../test/__init__.py
+    dest: test/__init__.py
+
+  - src: ../../common/check_imagestreams.py
+    dest: test/check_imagestreams.py
+
+  - src: ../../test/conftest.py
+    dest: test/conftest.py
+
+  - src: ../../examples/
+    dest: test/examples
+
+  - src: ../../imagestreams/
+    dest: test/imagestreams
+
+  - src: ../../test/run-minimal
+    dest: test/run
+
+  - src: ../../test/run-openshift-remote-cluster
+    dest: test/run-openshift-remote-cluster
+    check_symlink: false
+
+  - src: ../../test/run-pytest
+    dest: test/run-pytest
+
+  - src: ../../test/test-app
+    dest: test/test-app
+
+  - src: ../../test/test-binary
+    dest: test/test-binary
+
+  - src: ../../test/test-express-webapp
+    dest: test/test-express-webapp
+
+  - src: ../../test/test-fips
+    dest: test/test-fips
+
+  - src: ../../test/test-hw
+    dest: test/test-hw
+
+  - src: ../../test/test-incremental
+    dest: test/test-incremental
+
+  - src: ../../test/test-lib-nodejs.sh
+    dest: test/test-lib-nodejs.sh
+
+  - src: ../../common/test-lib-openshift.sh
+    dest: test/test-lib-openshift.sh
+    check_symlink: false
+
+  - src: ../../common/test-lib-remote-openshift.sh
+    dest: test/test-lib-remote-openshift.sh
+    check_symlink: false
+
+  - src: ../../common/test-lib.sh
+    dest: test/test-lib.sh
+
+  - src: ../../common/test-openshift.yaml
+    dest: test/test-openshift.yaml
+    check_symlink: false
+
+  - src: ../../test/test_container_apps.py
+    dest: test/test_container_apps.py
+
+  - src: ../../test/test_container_basics.py
+    dest: test/test_container_basics.py

manifest.yml

@@ -0,0 +1,67 @@
+# Manifest for image directories creation
+# every dest path will be prefixed by $DESTDIR/$version
+
+# Files containing distgen directives, which are used for each
+# (distro, version) combination not excluded in multispec
+DISTGEN_MULTI_RULES:
+  - src: src/Dockerfile
+    dest: Dockerfile.rhel8
+
+  - src: src/Dockerfile
+    dest: Dockerfile.rhel9
+
+  - src: src/Dockerfile
+    dest: Dockerfile.rhel10
+
+  - src: src/Dockerfile
+    dest: Dockerfile.c8s
+
+  - src: src/Dockerfile
+    dest: Dockerfile.c9s
+
+  - src: src/Dockerfile
+    dest: Dockerfile.c10s
+
+  - src: src/Dockerfile.fedora
+    dest: Dockerfile.fedora
+
+# Files to generate once per version
+DISTGEN_RULES:
+  - src: src/README.md
+    dest: README.md
+
+# Files to copy
+COPY_RULES:
+  - src: src/s2i/bin/assemble
+    dest: s2i/bin/assemble
+    mode: "0755"
+
+  - src: src/s2i/bin/run
+    dest: s2i/bin/run
+    mode: "0755"
+
+  - src: src/s2i/bin/save-artifacts
+    dest: s2i/bin/save-artifacts
+    mode: "0755"
+
+  - src: src/s2i/bin/usage
+    dest: s2i/bin/usage
+    mode: "0755"
+
+  - src: src/s2i/bin/init-wrapper
+    dest: s2i/bin/init-wrapper
+    mode: "0755"
+
+  - src: src/root/opt/app-root/etc/generate_container_user
+    dest: root/opt/app-root/etc/generate_container_user
+
+  - src: src/root/opt/app-root/etc/npm_global_module_list
+    dest: root/opt/app-root/etc/npm_global_module_list
+
+  - src: src/root/opt/app-root/etc/scl_enable
+    dest: root/opt/app-root/etc/scl_enable
+
+# Symbolic links
+SYMLINK_RULES:
+  - src: ../test
+    dest: test