Fix Dockerfiles for using nodejs22 package

Signed-off-by: Petr "Stone" Hracek <[email protected]>

22-minimal/Dockerfile.c10s

@@ -49,9 +49,9 @@ LABEL summary="$SUMMARY" \
       help="For more information visit https://github.com/sclorg/s2i-nodejs-container"
 
 # nodejs-full-i18n is included for error strings
-RUN INSTALL_PKGS="nodejs nodejs-nodemon nodejs-full-i18n npm findutils tar which" && \
+RUN INSTALL_PKGS="nodejs$NODEJS_VERSION nodejs-nodemon nodejs$NODEJS_VERSION-full-i18n npm findutils tar which" && \
     dnf -y --nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \
-    node -v | grep -qe "^v$NODEJS_VERSION\." && echo "Found VERSION $NODEJS_VERSION" && \
+    node-22 -v | grep -qe "^v$NODEJS_VERSION\." && echo "Found VERSION $NODEJS_VERSION" && \
     dnf clean all && \
     rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/yum.*
 

22-minimal/Dockerfile.fedora

@@ -52,11 +52,7 @@ LABEL summary="$SUMMARY" \
 RUN INSTALL_PKGS="nodejs$NODEJS_VERSION nodejs-nodemon nodejs$NODEJS_VERSION-full-i18n nodejs$NODEJS_VERSION-npm findutils tar which nss_wrapper-libs" && \
     microdnf -y --nodocs --setopt=install_weak_deps=0 install $INSTALL_PKGS && \
     microdnf clean all && \
-    ln -s /usr/bin/node-$NODEJS_VERSION /usr/bin/node && \
-    ln -s /usr/bin/npm-$NODEJS_VERSION /usr/bin/npm && \
-    ln -s /usr/bin/npx-$NODEJS_VERSION /usr/bin/npx && \
-    ln -s /usr/lib/node_modules_18/nodemon /usr/lib/node_modules_$NODEJS_VERSION/nodemon && \
-    node -v | grep -qe "^v$NODEJS_VERSION\." && echo "Found VERSION $NODEJS_VERSION" && \
+    node-22 -v | grep -qe "^v$NODEJS_VERSION\." && echo "Found VERSION $NODEJS_VERSION" && \
     rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/yum.*
 
 #

22/Dockerfile.c10s

@@ -54,10 +54,10 @@ LABEL summary="$SUMMARY" \
       usage="s2i build <SOURCE-REPOSITORY> quay.io/sclorg/$NAME-$NODEJS_VERSION-c10s:latest <APP-NAME>"
 
 # Package libatomic_ops was removed
-RUN INSTALL_PKGS="make gcc gcc-c++ git openssl-devel nodejs npm nodejs-nodemon nss_wrapper-libs which" && \
+RUN INSTALL_PKGS="make gcc gcc-c++ libatomic_ops git openssl-devel nodejs$NODEJS_VERSION nodejs-nodemon nodejs$NODEJS_VERSION-npm nss_wrapper-libs which" && \
     dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
-    node -v | grep -qe "^v$NODEJS_VERSION\." && echo "Found VERSION $NODEJS_VERSION" && \
+    node-22 -v | grep -qe "^v$NODEJS_VERSION\." && echo "Found VERSION $NODEJS_VERSION" && \
     dnf -y clean all --enablerepo='*'
 
 # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH

22/Dockerfile.fedora

@@ -51,11 +51,7 @@ LABEL summary="$SUMMARY" \
 RUN INSTALL_PKGS="make gcc gcc-c++ libatomic_ops git openssl-devel nodejs$NODEJS_VERSION nodejs-nodemon nodejs$NODEJS_VERSION-npm nss_wrapper-libs which" && \
     dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
-    ln -s /usr/bin/node-$NODEJS_VERSION /usr/bin/node && \
-    ln -s /usr/bin/npm-$NODEJS_VERSION /usr/bin/npm && \
-    ln -s /usr/bin/npx-$NODEJS_VERSION /usr/bin/npx && \
-    ln -s /usr/lib/node_modules_18/nodemon /usr/lib/node_modules_$NODEJS_VERSION/nodemon && \
-    node -v | grep -qe "^v$NODEJS_VERSION\." && echo "Found VERSION $NODEJS_VERSION" && \
+    node-22 -v | grep -qe "^v$NODEJS_VERSION\."  && echo "Found VERSION $NODEJS_VERSION" && \
     dnf -y clean all --enablerepo='*'
 
 # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH

test/test-lib-nodejs.sh

@@ -247,7 +247,12 @@ scl_usage() {
   fi
 }
 function test_scl_usage() {
-  scl_usage "node --version" "v${VERSION//-minimal/}."
+  VERSION=${VERSION//-minimal/}
+  if [ "$VERSION" == "22" ]; then
+    scl_usage "node-$VERSION --version" "v$VERSION."
+  else
+    scl_usage "node --version" "v$VERSION."
+  fi
   ct_check_testcase_result $?
 }