Add SHOW_WELCOME_MESSAGE variable to customize welcome message behavior (#319)

* Re-enabled deployments from main

* Add SHOW_WELCOME_MESSAGE environment variable

Author: jaydrogers

.github/workflows/action_publish-images-dev.yml

@@ -9,16 +9,14 @@ on:
       - .github/workflows/action_publish-images-**
       - .github/workflows/service_docker-**
       - scripts/**
-  # schedule:
-  #   - cron: '25 8 * * 1'
-  # push:
-  #   branches:
-  #     - main
-  #   paths:
-  #     - src/**
-  #     - .github/workflows/action_publish-images-**
-  #     - .github/workflows/service_docker-**
-  #     - scripts/**
+  push:
+    branches:
+      - main
+    paths:
+      - src/**
+      - .github/workflows/action_publish-images-**
+      - .github/workflows/service_docker-**
+      - scripts/**
 
 jobs:
   build-dev-images:

docs/content/docs/7.reference/1.environment-variable-specification.md

@@ -62,6 +62,7 @@ We like to customize our images on a per app basis using environment variables.
 `S6_BEHAVIOUR_IF_STAGE2_FAILS`<br />*Default: "2" (stop the container)*|Determines what the container should do if one of the service scripts fails (<a target="_blank" href="https://github.com/just-containers/s6-overlay#customizing-s6-overlay-behaviour">Official docs</a>)|fpm-nginx,<br />fpm-apache
 `S6_CMD_WAIT_FOR_SERVICES_MAXTIME`<br />*Default: "0"*|The maximum time (in milliseconds) the services could take to bring up before proceeding to CMD executing (<a target="_blank" href="https://github.com/just-containers/s6-overlay#customizing-s6-overlay-behaviour">Official docs</a>)|fpm-nginx,<br />fpm-apache
 `S6_VERBOSITY`<br />*Default: "1"*|Set the verbosity of "S6 Overlay" (the init system these images are based on). The default is "1" (print warnings and errors). The scale goes from 1 to 5, but the output will quickly become very noisy. If you're having issues, start here. You can also customize many other variables. (<a target="_blank" href="https://github.com/just-containers/s6-overlay#customizing-s6-behaviour">Official docs</a>)|fpm-nginx,<br />fpm-apache
+`SHOW_WELCOME_MESSAGE`<br />*Default: "true"*|Show a helpful welcome message showing container information when the container starts.|all
 `SSL_CERTIFICATE_FILE`<br />*Default: "/etc/ssl/private/self-signed-web.crt"*|Path to public certificate file for HTTPS. You must provide this file otherwise a self-signed key pair will be generated for you.|fpm-nginx,<br />fpm-apache
 `SSL_MODE`<br />*Default: "off"*|Configure how you would like to handle SSL. This can be "off" (HTTP only), "mixed" (HTTP + HTTPS), or "full" (HTTPS only). If you use HTTP, you may need to also change `PHP_SESSION_COOKIE_SECURE`.|fpm-nginx,<br />fpm-apache,<br />unit
 `SSL_PRIVATE_KEY_FILE`<br />*Default: "/etc/ssl/private/self-signed-web.key"*|Path to private key file for HTTPS. You must provide this file otherwise a self-signed key pair will be generated for you.|fpm-nginx,<br />fpm-apache

src/common/etc/entrypoint.d/0-container-info.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-if [ "$LOG_OUTPUT_LEVEL" != "off" ] && [ "$DISABLE_DEFAULT_CONFIG" = false ]; then
+if [ "$SHOW_WELCOME_MESSAGE" = "true" ] && [ "$LOG_OUTPUT_LEVEL" != "off" ] && [ "$DISABLE_DEFAULT_CONFIG" = false ]; then
 echo '
 --------------------------------------------------------------------
  ____                             ____  _     _        _   _

src/variations/cli/Dockerfile

@@ -44,7 +44,8 @@ ENV APP_BASE_DIR=/var/www/html \
     PHP_OPEN_BASEDIR="" \
     PHP_POST_MAX_SIZE="100M" \
     PHP_SESSION_COOKIE_SECURE=false \
-    PHP_UPLOAD_MAX_FILE_SIZE="100M"
+    PHP_UPLOAD_MAX_FILE_SIZE="100M" \
+    SHOW_WELCOME_MESSAGE=true
 
 # copy our scripts
 COPY --chmod=755 src/common/ /

src/variations/fpm-apache/Dockerfile

@@ -78,6 +78,7 @@ ENV APACHE_START_SERVERS="2" \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
     S6_KEEP_ENV=1 \
     S6_VERBOSITY=1 \
+    SHOW_WELCOME_MESSAGE=true \
     SSL_MODE=off \
     SSL_CERTIFICATE_FILE=/etc/ssl/private/self-signed-web.crt \
     SSL_PRIVATE_KEY_FILE=/etc/ssl/private/self-signed-web.key

src/variations/fpm-nginx/Dockerfile

@@ -100,7 +100,8 @@ ENV APP_BASE_DIR=/var/www/html \
     S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
     S6_KEEP_ENV=1 \
-    S6_VERBOSITY=1 \
+    S6_VERBOSITY=1  \
+    SHOW_WELCOME_MESSAGE=true \
     SSL_MODE=off \
     SSL_CERTIFICATE_FILE=/etc/ssl/private/self-signed-web.crt \
     SSL_PRIVATE_KEY_FILE=/etc/ssl/private/self-signed-web.key

src/variations/fpm/Dockerfile

@@ -50,7 +50,8 @@ ENV APP_BASE_DIR=/var/www/html \
     PHP_OPEN_BASEDIR="" \
     PHP_POST_MAX_SIZE="100M" \
     PHP_SESSION_COOKIE_SECURE=Off \
-    PHP_UPLOAD_MAX_FILE_SIZE="100M"
+    PHP_UPLOAD_MAX_FILE_SIZE="100M" \
+    SHOW_WELCOME_MESSAGE=true
 
 # copy our scripts
 COPY --chmod=755 src/common/ /

src/variations/unit/Dockerfile

@@ -100,6 +100,7 @@ ENV APP_BASE_DIR=/var/www/html \
     PHP_POST_MAX_SIZE="100M" \
     PHP_SESSION_COOKIE_SECURE=false \
     PHP_UPLOAD_MAX_FILE_SIZE="100M" \
+    SHOW_WELCOME_MESSAGE=true \
     SSL_CERT_BUNDLE_FILE=/etc/ssl/certs/private/bundle.pem \
     SSL_MODE=off \
     UNIT_CERTIFICATE_NAME=self-signed-web \