build: update hardened/prod healthcheck.sh, for ddev#6033

containers/ddev-webserver/ddev-webserver-base-scripts/healthcheck.sh

@@ -1,22 +1,22 @@
 #!/bin/sh
 
-# This uses /bin/sh so it doesn't initialize profile/bashrc/etc
+# This uses /bin/sh, so it doesn't initialize profile/bashrc/etc
 
 # ddev-webserver healthcheck
 
 set -e
 
 sleeptime=59
 
-# Make sure that mounted code, and mailpit
+# Make sure that phpstatus, mounted code, webserver and mailpit
 # are working.
 # Since docker doesn't provide a lazy period for startup,
 # we track health. If the last check showed healthy
 # as determined by existence of /tmp/healthy, then
 # sleep at startup. This requires the timeout to be set
 # higher than the sleeptime used here.
 if [ -f /tmp/healthy ]; then
-    printf "container was previously healthy, so sleeping ${sleeptime} seconds before continuing healthcheck...  "
+    printf "container was previously healthy, so sleeping %s seconds before continuing healthcheck... " ${sleeptime}
     sleep ${sleeptime}
 fi
 
@@ -61,17 +61,17 @@ if [ "${DDEV_WEBSERVER_TYPE#*-}" = "gunicorn" ]; then
 
 fi
 
-if [ "${DDEV_WEBSERVER_TYPE#*-}" = "fpm"  ]; then
+if [ "${DDEV_WEBSERVER_TYPE#*-}" = "fpm" ]; then
   gunicornstatus="true"
-  if curl --fail -s 127.0.0.1/phpstatus >/dev/null ; then
+  if curl --fail -s 127.0.0.1/phpstatus >/dev/null; then
     phpstatus="true"
     printf "phpstatus:OK "
   else
     printf "phpstatus:FAILED "
   fi
 fi
 
-if [ "${phpstatus}" = "true" ] && [ "${gunicornstatus}" = "true" ] && [ "${htmlaccess}" = "true" ] &&  [ "${mailpit}" = "true" ] ; then
+if [ "${phpstatus}" = "true" ] && [ "${gunicornstatus}" = "true" ] && [ "${htmlaccess}" = "true" ] && [ "${mailpit}" = "true" ]; then
     touch /tmp/healthy
     exit 0
 fi

containers/ddev-webserver/ddev-webserver-prod-scripts/healthcheck.sh

@@ -1,14 +1,14 @@
 #!/bin/sh
 
-# This uses /bin/sh so it doesn't initialize profile/bashrc/etc
+# This uses /bin/sh, so it doesn't initialize profile/bashrc/etc
 
 # ddev-webserver healthcheck
 
 set -e
 
 sleeptime=59
 
-# Make sure that both phpstatus, mounted code NOT mailpit
+# Make sure that phpstatus, mounted code, webserver, NOT mailpit
 # (mailpit is excluded on hardened/prod)
 # are working.
 # Since docker doesn't provide a lazy period for startup,
@@ -17,10 +17,18 @@ sleeptime=59
 # sleep at startup. This requires the timeout to be set
 # higher than the sleeptime used here.
 if [ -f /tmp/healthy ]; then
-    printf "container was previously healthy, so sleeping ${sleeptime} seconds before continuing healthcheck...  "
+    printf "container was previously healthy, so sleeping %s seconds before continuing healthcheck... " ${sleeptime}
     sleep ${sleeptime}
 fi
 
+# Shutdown the supervisor if one of the critical processes is in the FATAL state
+for service in php-fpm nginx apache2; do
+  if supervisorctl status "${service}" 2>/dev/null | grep -q FATAL; then
+    printf "%s:FATAL " "${service}"
+    supervisorctl shutdown
+  fi
+done
+
 phpstatus="false"
 htmlaccess="false"
 gunicornstatus="false"
@@ -29,7 +37,7 @@ if ls /var/www/html >/dev/null; then
     htmlaccess="true"
     printf "/var/www/html:OK "
 else
-    printf "/var/www/html:FAILED"
+    printf "/var/www/html:FAILED "
 fi
 
 # If DDEV_WEBSERVER_TYPE is not set, use reasonable default
@@ -39,16 +47,16 @@ if [ "${DDEV_WEBSERVER_TYPE#*-}" = "gunicorn" ]; then
   phpstatus="true"
   if pkill -0 gunicorn; then
     gunicornstatus="true"
-    printf "gunicorn:OK"
+    printf "gunicorn:OK "
   else
     printf "gunicorn:FAILED "
   fi
 
 fi
 
-if [ "${DDEV_WEBSERVER_TYPE#*-}" = "fpm"  ]; then
+if [ "${DDEV_WEBSERVER_TYPE#*-}" = "fpm" ]; then
   gunicornstatus="true"
-  if curl --fail -s 127.0.0.1/phpstatus >/dev/null ; then
+  if curl --fail -s 127.0.0.1/phpstatus >/dev/null; then
     phpstatus="true"
     printf "phpstatus:OK "
   else
@@ -63,5 +71,3 @@ fi
 rm -f /tmp/healthy
 
 exit 1
-
-

pkg/versionconstants/versionconstants.go

@@ -11,7 +11,7 @@ var AmplitudeAPIKey = ""
 var WebImg = "ddev/ddev-webserver"
 
 // WebTag defines the default web image tag
-var WebTag = "v1.23.0-1" // Note that this can be overridden by make
+var WebTag = "20240424_stasadev_healthcheck" // Note that this can be overridden by make
 
 // DBImg defines the default db image used for applications.
 var DBImg = "ddev/ddev-dbserver"