Merge pull request 'Fix wedged-container outage: TCP healthcheck + tini-managed PID 1' (#1) from fix/wedged-container-outage into main

Reviewed-on: #1

Dockerfile

@@ -5,7 +5,7 @@ ARG NODEVER=20
 RUN dnf install -y \
       https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
     dnf update -y && \
-    dnf install -y wget procps cronie iproute nginx openssl git microdnf make gcc gcc-c++ && \
+    dnf install -y wget procps cronie iproute nginx openssl git microdnf make gcc gcc-c++ tini && \
     dnf group install -y 'Development Tools' && \
     dnf clean all && \
     rm -rf /var/cache/dnf /usr/share/doc /usr/share/man /usr/share/locale/* \
@@ -36,6 +36,7 @@ COPY ./examples/ /examples/
 RUN echo "15 */12 * * * root /scripts/log-rotate.sh" >> /etc/crontab
 
 HEALTHCHECK --interval=30s --timeout=5s --start-period=60s --retries=3 \
-  CMD wget --spider -q http://localhost/ || exit 1
+  CMD bash -c ': </dev/tcp/127.0.0.1/3000 && : </dev/tcp/127.0.0.1/80' \
+      || exit 1
 
 ENTRYPOINT [ "/scripts/entrypoint.sh" ]

scripts/entrypoint.sh

@@ -89,20 +89,18 @@ if [ ! -f /home/$user/app/ecosystem.config.js ]; then
   chown $user:$user /home/$user/app/ecosystem.config.js
 fi
 
-# Start PM2 as the user with HOME environment set
+# Mirror logs to docker logs in the background.
-echo "Starting PM2 as user $user..."
+# Use -F (capital) so logrotate-recreated files keep streaming.
+tail -F /home/$user/logs/nginx/access.log \
+        /home/$user/logs/nginx/error.log \
+        /home/$user/logs/nodejs/app.log \
+        /home/$user/logs/nodejs/out.log \
+        /home/$user/logs/nodejs/error.log 2>/dev/null &
+
+# Start PM2 under tini so it becomes PID 1 (with proper signal forwarding
+# and zombie reaping for nginx/crond/memcached children that reparent here).
+# When pm2 exits (e.g. max_restarts exhausted), tini exits and Docker's
+# restart policy brings the container back.
+echo "Starting PM2 as user $user (under tini as PID 1)..."
 cd /home/$user/app
-# Use su with login shell to ensure clean environment
+exec tini -- su - $user -c "cd /home/$user/app && NODE_ENV=production pm2 start ecosystem.config.js --no-daemon"
-su - $user -c "cd /home/$user/app && NODE_ENV=production pm2 start ecosystem.config.js --no-daemon" &
-
-# Give PM2 time to start
-sleep 5
-
-# Check if the app is running
-echo "Checking PM2 status..."
-su -c "pm2 status" $user
-
-# Follow logs
-tail -f /home/$user/logs/nginx/* /home/$user/logs/nodejs/*
-
-exit 0