Adjust prod Docker

Dockerfiles/work/data/docker-entrypoint.sh

@@ -1,73 +1,78 @@
-#!/bin/sh
-#
-# Available global variables:
-#   + MY_USER
-#   + MY_GROUP
+#!/usr/bin/env bash
 
 set -e
 set -u
+set -p pipefail
 
 
 ###
-### Variables
+### Globals
 ###
-PHP_INI_PATH="/usr/local/etc/php.ini"
-FPM_ERROR_LOG_CFG="/usr/local/etc/php-fpm.conf"
-FPM_ACCESS_LOG_CFG="/usr/local/etc/php-fpm.d/zzz-docker.conf"
+
+# The following global variables are available by our Dockerfile itself:
+#   MY_USER
+#   MY_GROUP
+#   MY_UID
+#   MY_GID
+
+# Path to scripts to source
+CONFIG_DIR="/docker-entrypoint.d"
+
+# php.ini.d directory
+PHP_INI_DIR="/usr/local/etc/php/conf.d"
+
+# This file holds error and access log definitions
+FPM_CONF_LOGFILE="/usr/local/etc/php-fpm.d/logfiles.conf"
+
+# PHP-FPM log dir
 FPM_LOG_DIR="/var/log/php"
 
-#PHP_CUST_MODULE_DIR="/etc/php-modules.d"
-
+# Custom ini dir (to be copied to actual ini dir)
 PHP_CUST_INI_DIR="/etc/php-custom.d"
-PHP_REAL_INI_DIR="/usr/local/etc/php.d"
 
+# Supervisord config directory
 SUPERVISOR_CONFD="/etc/supervisor/conf.d"
 
 
 ###
 ### Source libs
 ###
-init="$( find /docker-entrypoint.d -name '*.sh' -type f | sort -u )"
+init="$( find "${CONFIG_DIR}" -name '*.sh' -type f | sort -u )"
 for f in ${init}; do
 	# shellcheck disable=SC1090
 	. "${f}"
 done
 
 
-###
-### Set Debug level
-###
-DEBUG_LEVEL="$( get_debug_level "DEBUG_ENTRYPOINT" "0" )"
-log "info" "Debug level: ${DEBUG_LEVEL}" "${DEBUG_LEVEL}"
-
-
-
-#############################################################
-## Sanity checks
-#############################################################
-
-if ! command -v socat >/dev/null 2>&1; then
-	log "err" "socat not found, but required." "${DEBUG_LEVEL}"
-	exit 1
-fi
-
-
 
 #############################################################
 ## Entry Point
 #############################################################
 
+###
+### Set Debug level
+###
+DEBUG_LEVEL="$( env_get "DEBUG_ENTRYPOINT" "0" )"
+log "info" "Debug level: ${DEBUG_LEVEL}" "${DEBUG_LEVEL}"
+
+
 ###
 ### Change uid/gid
 ###
-set_uid "NEW_UID"
-set_gid "NEW_GID"
+set_uid "NEW_UID" "${MY_USER}"  "/home/${MY_USER}" "${DEBUG_LEVEL}"
+set_gid "NEW_GID" "${MY_GROUP}" "/home/${MY_USER}" "${DEBUG_LEVEL}"
 
 
 ###
 ### Set timezone
 ###
-set_timezone "TIMEZONE" "${PHP_INI_PATH}"
+set_timezone "TIMEZONE" "${PHP_INI_DIR}" "${DEBUG_LEVEL}"
+
+
+###
+### Setup postfix
+###
+set_postfix "ENABLE_MAIL" "${MY_USER}" "${MY_GROUP}" "${PHP_INI_DIR}" "${DEBUG_LEVEL}"
 
 
 ###
@@ -76,20 +81,16 @@ set_timezone "TIMEZONE" "${PHP_INI_PATH}"
 set_docker_logs \
 	"DOCKER_LOGS" \
 	"${FPM_LOG_DIR}" \
-	"${FPM_ERROR_LOG_CFG}" \
-	"${FPM_ACCESS_LOG_CFG}"
-
-
-###
-### Setup postfix
-###
-set_postfix "ENABLE_MAIL"
+	"${FPM_CONF_LOGFILE}" \
+	"${MY_USER}" \
+	"${MY_GROUP}" \
+	"${DEBUG_LEVEL}"
 
 
 ###
 ### Validate socat port forwards
 ###
-if ! port_forward_validate "FORWARD_PORTS_TO_LOCALHOST"; then
+if ! port_forward_validate "FORWARD_PORTS_TO_LOCALHOST" "${DEBUG_LEVEL}"; then
 	exit 1
 fi
 
@@ -101,7 +102,11 @@ for line in $( port_forward_get_lines "FORWARD_PORTS_TO_LOCALHOST" ); do
 	lport="$( port_forward_get_lport "${line}" )"
 	rhost="$( port_forward_get_rhost "${line}" )"
 	rport="$( port_forward_get_rport "${line}" )"
-	supervisor_add_service "socat-${lport}-${rhost}-${rport}" "/usr/bin/socat tcp-listen:${lport},reuseaddr,fork tcp:${rhost}:${rport}" "${SUPERVISOR_CONFD}"
+	supervisor_add_service \
+		"socat-${lport}-${rhost}-${rport}" \
+		"/usr/bin/socat tcp-listen:${lport},reuseaddr,fork tcp:${rhost}:${rport}" \
+		"${SUPERVISOR_CONFD}" \
+		"${DEBUG_LEVEL}"
 done
 
 
@@ -109,21 +114,21 @@ done
 ### Supervisor: rsyslogd & postfix
 ###
 if [ "$( env_get "ENABLE_MAIL" )" = "1" ]; then
-	supervisor_add_service "rsyslogd" "/usr/sbin/rsyslogd -n"      "${SUPERVISOR_CONFD}" "1"
-	supervisor_add_service "postfix"  "/usr/local/sbin/postfix.sh" "${SUPERVISOR_CONFD}"
+	supervisor_add_service "rsyslogd" "/usr/sbin/rsyslogd -n"      "${SUPERVISOR_CONFD}" "${DEBUG_LEVEL}" "1"
+	supervisor_add_service "postfix"  "/usr/local/sbin/postfix.sh" "${SUPERVISOR_CONFD}" "${DEBUG_LEVEL}"
 fi
 
 
 ###
 ### Supervisor: php-fpm
 ###
-supervisor_add_service "php-fpm"  "/usr/local/sbin/php-fpm" "${SUPERVISOR_CONFD}"
+supervisor_add_service "php-fpm"  "/usr/local/sbin/php-fpm" "${SUPERVISOR_CONFD}" "${DEBUG_LEVEL}"
 
 
 ###
 ### Copy custom *.ini files
 ###
-copy_ini_files "${PHP_CUST_INI_DIR}" "${PHP_REAL_INI_DIR}"
+copy_ini_files "${PHP_CUST_INI_DIR}" "${PHP_INI_DIR}" "${DEBUG_LEVEL}"
 
 
 ###
@@ -134,6 +139,7 @@ set_mds_settings "MYSQL_BACKUP_USER" "MYSQL_BACKUP_PASS" "MYSQL_BACKUP_HOST"
 
 
 ###
-### Start
+### Startup
 ###
+log "info" "Starting supervisord" "${DEBUG_LEVEL}"
 exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf