Adding NODE_CMD option as env variable for specifying run command.

14-minimal/Dockerfile.rhel8

@@ -58,6 +58,7 @@ RUN INSTALL_PKGS="nodejs nodejs-nodemon npm findutils tar" && \
     rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/yum.*
 
 COPY ./s2i/bin/ /usr/libexec/s2i
+RUN chmod +x /usr/libexec/s2i/init-wrapper
 
 # Copy extra files to the image.
 COPY ./root/ /

14-minimal/README.md

@@ -1,4 +1,4 @@
 NodeJS 14 minimal container image
 =========================
 
-**The NodeJS 14 minimal image is deprecated.**
+**The NodeJS 14 minimal image is deprecated.**

14-minimal/s2i/bin/init-wrapper

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Overview of how this script works: http://veithen.io/2014/11/16/sigterm-propagation.html
+# Set a trap to kill the main app process when this
+# init script receives SIGTERM or SIGINT
+trap 'kill -s TERM $PID' TERM INT
+# Execute the main application in the background
+"$@" &
+PID=$!
+# wait command always terminates when trap is caught, even if the process hasn't finished yet
+wait $PID
+# Remove the trap and wait till the app process finishes completely
+trap - TERM INT
+# We wait again, since the first wait terminates when trap is caught
+wait $PID
+# Exit with the exit code of the app process
+STATUS=$?
+exit $STATUS

14-minimal/s2i/bin/run

@@ -16,6 +16,29 @@ run_node() {
   if [ "$DEV_MODE" == true ]; then
     echo "Launching via nodemon..."
     exec nodemon --inspect="$DEBUG_PORT"
+  elif [ -n "$NODE_CMD" ] && [ "$INIT_WRAPPER" == true ]; then
+    echo "launching via init wrapper..."
+    exec ${STI_SCRIPTS_PATH}/init-wrapper $NODE_CMD
+  elif [ -n "$NODE_CMD" ] && [ "$INIT_WRAPPER" == false ]; then
+    echo "Launching via ${NODE_CMD}"
+    exec $NODE_CMD
+  elif [ ! -n "$NODE_CMD" ] && [ "$INIT_WRAPPER" == true ]; then
+
+    package_json_start=$(sed -n 's/\s*"start"\s*:\s*"\(.*\)".*/\1/p' package.json)
+    package_json_main=$(sed -n 's/\s*"main"\s*:\s*"\(.*\)".*/\1/p' package.json)
+
+    if [ -n "$package_json_start" ]; then
+      start_command=$package_json_start
+    elif [ -n $package_json_main ]; then
+      start_command="node ."
+    elif [ -f "server.js" ]; then
+      start_command="node server.js"
+    else
+      echo "Failed to find file for starting the Node.js application"
+      exit 1
+    fi
+    echo "launching via init wrapper..."
+    exec ${STI_SCRIPTS_PATH}/init-wrapper $start_command
   else
     echo "Launching via npm..."
     exec npm run -d $NPM_RUN

14/Dockerfile

@@ -63,6 +63,7 @@ RUN yum install -y centos-release-scl-rh && \
 
 # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
+RUN chmod +x $STI_SCRIPTS_PATH/init-wrapper
 
 # Copy extra files to the image, including help file.
 COPY ./root/ /

14/Dockerfile.fedora

@@ -58,6 +58,7 @@ RUN yum -y module enable nodejs:$NODEJS_VERSION && \
 
 # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
+RUN chmod +x /usr/libexec/s2i/init-wrapper
 
 # Copy extra files to the image, including help file.
 COPY ./root/ /

14/Dockerfile.rhel8

@@ -65,6 +65,7 @@ RUN yum -y module enable nodejs:$NODEJS_VERSION && \
 
 # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
+RUN chmod +x $STI_SCRIPTS_PATH/init-wrapper
 
 # Copy extra files to the image.
 COPY ./root/ /

14/README.md

@@ -1,4 +1,4 @@
 NodeJS 14 container image
 =========================
 
-**The NodeJS 14 image is deprecated.**
+**The NodeJS 14 image is deprecated.**

14/s2i/bin/init-wrapper

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Overview of how this script works: http://veithen.io/2014/11/16/sigterm-propagation.html
+# Set a trap to kill the main app process when this
+# init script receives SIGTERM or SIGINT
+trap 'kill -s TERM $PID' TERM INT
+# Execute the main application in the background
+"$@" &
+PID=$!
+# wait command always terminates when trap is caught, even if the process hasn't finished yet
+wait $PID
+# Remove the trap and wait till the app process finishes completely
+trap - TERM INT
+# We wait again, since the first wait terminates when trap is caught
+wait $PID
+# Exit with the exit code of the app process
+STATUS=$?
+exit $STATUS

14/s2i/bin/run

@@ -20,11 +20,34 @@ run_node() {
   if [ "$DEV_MODE" == true ]; then
     echo "Launching via nodemon..."
     exec nodemon --inspect="$DEBUG_PORT"
+  elif [ -n "$NODE_CMD" ] && [ "$INIT_WRAPPER" == true ]; then
+    echo "launching via init wrapper..."
+    exec ${STI_SCRIPTS_PATH}/init-wrapper $NODE_CMD
+  elif [ -n "$NODE_CMD" ] && [ "$INIT_WRAPPER" == false ]; then
+    echo "Launching via ${NODE_CMD}"
+    exec $NODE_CMD
+  elif [ ! -n "$NODE_CMD" ] && [ "$INIT_WRAPPER" == true ]; then
+
+    package_json_start=$(sed -n 's/\s*"start"\s*:\s*"\(.*\)".*/\1/p' package.json)
+    package_json_main=$(sed -n 's/\s*"main"\s*:\s*"\(.*\)".*/\1/p' package.json)
+
+    if [ -n "$package_json_start" ]; then
+      start_command=$package_json_start
+    elif [ -n $package_json_main ]; then
+      start_command="node ."
+    elif [ -f "server.js" ]; then
+      start_command="node server.js"
+    else
+      echo "Failed to find file for starting the Node.js application"
+      exit 1
+    fi
+    echo "launching via init wrapper..."
+    exec ${STI_SCRIPTS_PATH}/init-wrapper $start_command
   else
     echo "Launching via npm..."
     exec npm run -d $NPM_RUN
   fi
-} 
+}
 
 #Set the debug port to 5858 by default.
 if [ -z "$DEBUG_PORT" ]; then

16-minimal/Dockerfile.rhel8

@@ -59,6 +59,7 @@ RUN INSTALL_PKGS="nodejs nodejs-nodemon nodejs-full-i18n npm findutils tar which
     rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/yum.*
 
 COPY ./s2i/bin/ /usr/libexec/s2i
+RUN chmod +x /usr/libexec/s2i/init-wrapper
 
 # Copy extra files to the image.
 COPY ./root/ /

16-minimal/Dockerfile.rhel9

@@ -57,6 +57,7 @@ RUN INSTALL_PKGS="nodejs nodejs-nodemon nodejs-full-i18n npm findutils tar which
     rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/yum.*
 
 COPY ./s2i/bin/ /usr/libexec/s2i
+RUN chmod +x /usr/libexec/s2i/init-wrapper
 
 # Copy extra files to the image.
 COPY ./root/ /

16-minimal/s2i/bin/init-wrapper

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Overview of how this script works: http://veithen.io/2014/11/16/sigterm-propagation.html
+# Set a trap to kill the main app process when this
+# init script receives SIGTERM or SIGINT
+trap 'kill -s TERM $PID' TERM INT
+# Execute the main application in the background
+"$@" &
+PID=$!
+# wait command always terminates when trap is caught, even if the process hasn't finished yet
+wait $PID
+# Remove the trap and wait till the app process finishes completely
+trap - TERM INT
+# We wait again, since the first wait terminates when trap is caught
+wait $PID
+# Exit with the exit code of the app process
+STATUS=$?
+exit $STATUS

16-minimal/s2i/bin/run

@@ -16,11 +16,34 @@ run_node() {
   if [ "$DEV_MODE" == true ]; then
     echo "Launching via nodemon..."
     exec nodemon --inspect="$DEBUG_PORT"
+  elif [ -n "$NODE_CMD" ] && [ "$INIT_WRAPPER" == true ]; then
+    echo "launching via init wrapper..."
+    exec ${STI_SCRIPTS_PATH}/init-wrapper $NODE_CMD
+  elif [ -n "$NODE_CMD" ] && [ "$INIT_WRAPPER" == false ]; then
+    echo "Launching via ${NODE_CMD}"
+    exec $NODE_CMD
+  elif [ ! -n "$NODE_CMD" ] && [ "$INIT_WRAPPER" == true ]; then
+
+    package_json_start=$(sed -n 's/\s*"start"\s*:\s*"\(.*\)".*/\1/p' package.json)
+    package_json_main=$(sed -n 's/\s*"main"\s*:\s*"\(.*\)".*/\1/p' package.json)
+
+    if [ -n "$package_json_start" ]; then
+      start_command=$package_json_start
+    elif [ -n $package_json_main ]; then
+      start_command="node ."
+    elif [ -f "server.js" ]; then
+      start_command="node server.js"
+    else
+      echo "Failed to find file for starting the Node.js application"
+      exit 1
+    fi
+    echo "launching via init wrapper..."
+    exec ${STI_SCRIPTS_PATH}/init-wrapper $start_command
   else
     echo "Launching via npm..."
     exec npm run -d $NPM_RUN
   fi
-} 
+}
 
 #Set the debug port to 5858 by default.
 if [ -z "$DEBUG_PORT" ]; then

16/Dockerfile.c9s

@@ -64,6 +64,7 @@ RUN MODULE_DEPS="make gcc gcc-c++ git openssl-devel" && \
 
 # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
+RUN chmod +x $STI_SCRIPTS_PATH/init-wrapper
 
 # Copy extra files to the image.
 COPY ./root/ /

16/Dockerfile.fedora

@@ -63,6 +63,7 @@ RUN MODULE_DEPS="make gcc gcc-c++ libatomic_ops git openssl-devel" && \
 
 # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
+RUN chmod +x $STI_SCRIPTS_PATH/init-wrapper
 
 # Copy extra files to the image, including help file.
 COPY ./root/ /

16/Dockerfile.rhel8

@@ -1,4 +1,4 @@
-FROM ubi8/s2i-core:1
+FROM registry.access.redhat.com/ubi8/s2i-core:1
 
 # This image provides a Node.JS environment you can use to run your Node.JS
 # applications.
@@ -65,6 +65,7 @@ RUN yum -y module enable nodejs:$NODEJS_VERSION && \
 
 # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
+RUN chmod +x $STI_SCRIPTS_PATH/init-wrapper
 
 # Copy extra files to the image.
 COPY ./root/ /

16/Dockerfile.rhel9

@@ -63,6 +63,7 @@ RUN MODULE_DEPS="make gcc gcc-c++ git openssl-devel" && \
 
 # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH
+RUN chmod +x $STI_SCRIPTS_PATH/init-wrapper
 
 # Copy extra files to the image.
 COPY ./root/ /

16/README.md

@@ -1,4 +1,4 @@
 NodeJS 16 container image
 =========================
 
-**The NodeJS 16 image is deprecated.**
+**The NodeJS 16 image is deprecated.**

16/s2i/bin/init-wrapper

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Overview of how this script works: http://veithen.io/2014/11/16/sigterm-propagation.html
+# Set a trap to kill the main app process when this
+# init script receives SIGTERM or SIGINT
+trap 'kill -s TERM $PID' TERM INT
+# Execute the main application in the background
+"$@" &
+PID=$!
+# wait command always terminates when trap is caught, even if the process hasn't finished yet
+wait $PID
+# Remove the trap and wait till the app process finishes completely
+trap - TERM INT
+# We wait again, since the first wait terminates when trap is caught
+wait $PID
+# Exit with the exit code of the app process
+STATUS=$?
+exit $STATUS

16/s2i/bin/run

@@ -20,11 +20,34 @@ run_node() {
   if [ "$DEV_MODE" == true ]; then
     echo "Launching via nodemon..."
     exec nodemon --inspect="$DEBUG_PORT"
+  elif [ -n "$NODE_CMD" ] && [ "$INIT_WRAPPER" == true ]; then
+    echo "launching via init wrapper..."
+    exec ${STI_SCRIPTS_PATH}/init-wrapper $NODE_CMD
+  elif [ -n "$NODE_CMD" ] && [ "$INIT_WRAPPER" == false ]; then
+    echo "Launching via ${NODE_CMD}"
+    exec $NODE_CMD
+  elif [ ! -n "$NODE_CMD" ] && [ "$INIT_WRAPPER" == true ]; then
+
+    package_json_start=$(sed -n 's/\s*"start"\s*:\s*"\(.*\)".*/\1/p' package.json)
+    package_json_main=$(sed -n 's/\s*"main"\s*:\s*"\(.*\)".*/\1/p' package.json)
+
+    if [ -n "$package_json_start" ]; then
+      start_command=$package_json_start
+    elif [ -n $package_json_main ]; then
+      start_command="node ."
+    elif [ -f "server.js" ]; then
+      start_command="node server.js"
+    else
+      echo "Failed to find file for starting the Node.js application"
+      exit 1
+    fi
+    echo "launching via init wrapper..."
+    exec ${STI_SCRIPTS_PATH}/init-wrapper $start_command
   else
     echo "Launching via npm..."
     exec npm run -d $NPM_RUN
   fi
-} 
+}
 
 #Set the debug port to 5858 by default.
 if [ -z "$DEBUG_PORT" ]; then

18-minimal/Dockerfile.c8s

@@ -59,6 +59,8 @@ RUN INSTALL_PKGS="nodejs nodejs-nodemon nodejs-full-i18n npm findutils tar which
 
 COPY ./s2i/bin/ /usr/libexec/s2i
 
+RUN chmod +x /usr/libexec/s2i/init-wrapper
+
 # Copy extra files to the image.
 COPY ./root/ /
 

18-minimal/Dockerfile.c9s

@@ -58,6 +58,7 @@ RUN INSTALL_PKGS="nodejs nodejs-nodemon nodejs-full-i18n npm findutils tar which
     rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/yum.*
 
 COPY ./s2i/bin/ /usr/libexec/s2i
+RUN chmod +x /usr/libexec/s2i/init-wrapper
 
 # Copy extra files to the image.
 COPY ./root/ /

18-minimal/Dockerfile.fedora

@@ -56,6 +56,7 @@ RUN INSTALL_PKGS="nodejs nodejs-nodemon nodejs-full-i18n nodejs-npm findutils ta
     rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/yum.*
 
 COPY ./s2i/bin/ /usr/libexec/s2i
+RUN chmod +x /usr/libexec/s2i/init-wrapper
 
 # Copy extra files to the image.
 COPY ./root/ /

18-minimal/Dockerfile.rhel8

@@ -60,6 +60,8 @@ RUN INSTALL_PKGS="nodejs nodejs-nodemon nodejs-full-i18n npm findutils tar which
 
 COPY ./s2i/bin/ /usr/libexec/s2i
 
+RUN chmod +x /usr/libexec/s2i/init-wrapper
+
 # Copy extra files to the image.
 COPY ./root/ /
 

18-minimal/Dockerfile.rhel9

@@ -60,6 +60,8 @@ RUN INSTALL_PKGS="nodejs nodejs-nodemon nodejs-full-i18n npm findutils tar which
 
 COPY ./s2i/bin/ /usr/libexec/s2i
 
+RUN chmod +x /usr/libexec/s2i/init-wrapper
+
 # Copy extra files to the image.
 COPY ./root/ /