Merge pull request #78 from devilbox/release-0.59

Custom startup scripts
devilbox · Dec 24, 2018 · e55469f · e55469f
2 parents 689703a + 85991d2
commit e55469f
Show file tree

Hide file tree

Showing 41 changed files with 140 additions and 78 deletions.
diff --git a/.../data/docker-entrypoint.d/00-base-libs.sh → ...data/docker-entrypoint.d/100-base-libs.sh b/.../data/docker-entrypoint.d/00-base-libs.sh → ...data/docker-entrypoint.d/100-base-libs.sh
diff --git a/...se/data/docker-entrypoint.d/01-uid-gid.sh → ...e/data/docker-entrypoint.d/101-uid-gid.sh b/...se/data/docker-entrypoint.d/01-uid-gid.sh → ...e/data/docker-entrypoint.d/101-uid-gid.sh
diff --git a/Dockerfiles/prod/Dockerfile-5.2 b/Dockerfiles/prod/Dockerfile-5.2
@@ -24,6 +24,7 @@ RUN set -x \
 		locales-all \
 		postfix \
 		postfix-pcre \
+		cron \
 		rsyslog \
 		socat \
 		supervisor \
@@ -72,9 +73,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
 ###
 ### Volumes
 ###
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /var/log/php
 VOLUME /var/mail
 

diff --git a/Dockerfiles/prod/Dockerfile-5.3 b/Dockerfiles/prod/Dockerfile-5.3
@@ -24,6 +24,7 @@ RUN set -x \
 		locales-all \
 		postfix \
 		postfix-pcre \
+		cron \
 		rsyslog \
 		socat \
 		supervisor \
@@ -72,9 +73,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
 ###
 ### Volumes
 ###
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /var/log/php
 VOLUME /var/mail
 

diff --git a/Dockerfiles/prod/Dockerfile-5.4 b/Dockerfiles/prod/Dockerfile-5.4
@@ -24,6 +24,7 @@ RUN set -x \
 		locales-all \
 		postfix \
 		postfix-pcre \
+		cron \
 		rsyslog \
 		socat \
 		supervisor \
@@ -72,9 +73,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
 ###
 ### Volumes
 ###
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /var/log/php
 VOLUME /var/mail
 

diff --git a/Dockerfiles/prod/Dockerfile-5.5 b/Dockerfiles/prod/Dockerfile-5.5
@@ -24,6 +24,7 @@ RUN set -x \
 		locales-all \
 		postfix \
 		postfix-pcre \
+		cron \
 		rsyslog \
 		socat \
 		supervisor \
@@ -72,9 +73,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
 ###
 ### Volumes
 ###
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /var/log/php
 VOLUME /var/mail
 

diff --git a/Dockerfiles/prod/Dockerfile-5.6 b/Dockerfiles/prod/Dockerfile-5.6
@@ -24,6 +24,7 @@ RUN set -x \
 		locales-all \
 		postfix \
 		postfix-pcre \
+		cron \
 		rsyslog \
 		socat \
 		supervisor \
@@ -72,9 +73,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
 ###
 ### Volumes
 ###
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /var/log/php
 VOLUME /var/mail
 

diff --git a/Dockerfiles/prod/Dockerfile-7.0 b/Dockerfiles/prod/Dockerfile-7.0
@@ -24,6 +24,7 @@ RUN set -x \
 		locales-all \
 		postfix \
 		postfix-pcre \
+		cron \
 		rsyslog \
 		socat \
 		supervisor \
@@ -72,9 +73,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
 ###
 ### Volumes
 ###
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /var/log/php
 VOLUME /var/mail
 

diff --git a/Dockerfiles/prod/Dockerfile-7.1 b/Dockerfiles/prod/Dockerfile-7.1
@@ -24,6 +24,7 @@ RUN set -x \
 		locales-all \
 		postfix \
 		postfix-pcre \
+		cron \
 		rsyslog \
 		socat \
 		supervisor \
@@ -72,9 +73,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
 ###
 ### Volumes
 ###
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /var/log/php
 VOLUME /var/mail
 

diff --git a/Dockerfiles/prod/Dockerfile-7.2 b/Dockerfiles/prod/Dockerfile-7.2
@@ -24,6 +24,7 @@ RUN set -x \
 		locales-all \
 		postfix \
 		postfix-pcre \
+		cron \
 		rsyslog \
 		socat \
 		supervisor \
@@ -72,9 +73,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
 ###
 ### Volumes
 ###
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /var/log/php
 VOLUME /var/mail
 

diff --git a/Dockerfiles/prod/Dockerfile-7.3 b/Dockerfiles/prod/Dockerfile-7.3
@@ -24,6 +24,7 @@ RUN set -x \
 		locales-all \
 		postfix \
 		postfix-pcre \
+		cron \
 		rsyslog \
 		socat \
 		supervisor \
@@ -72,9 +73,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
 ###
 ### Volumes
 ###
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /var/log/php
 VOLUME /var/mail
 

diff --git a/Dockerfiles/prod/Dockerfile-7.4 b/Dockerfiles/prod/Dockerfile-7.4
@@ -24,6 +24,7 @@ RUN set -x \
 		locales-all \
 		postfix \
 		postfix-pcre \
+		cron \
 		rsyslog \
 		socat \
 		supervisor \
@@ -72,9 +73,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
 ###
 ### Volumes
 ###
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /var/log/php
 VOLUME /var/mail
 

diff --git a/...d/data/docker-entrypoint.d/30-timezone.sh → .../data/docker-entrypoint.d/300-timezone.sh b/...d/data/docker-entrypoint.d/30-timezone.sh → .../data/docker-entrypoint.d/300-timezone.sh
diff --git a/...od/data/docker-entrypoint.d/31-postfix.sh → ...d/data/docker-entrypoint.d/301-postfix.sh b/...od/data/docker-entrypoint.d/31-postfix.sh → ...d/data/docker-entrypoint.d/301-postfix.sh
diff --git a/...ata/docker-entrypoint.d/32-docker-logs.sh → ...ta/docker-entrypoint.d/302-docker-logs.sh b/...ata/docker-entrypoint.d/32-docker-logs.sh → ...ta/docker-entrypoint.d/302-docker-logs.sh
diff --git a/...-entrypoint.d/33-socat-port-forwarding.sh → ...entrypoint.d/303-socat-port-forwarding.sh b/...-entrypoint.d/33-socat-port-forwarding.sh → ...entrypoint.d/303-socat-port-forwarding.sh
diff --git a/...data/docker-entrypoint.d/34-supervisor.sh → ...ata/docker-entrypoint.d/304-supervisor.sh b/...data/docker-entrypoint.d/34-supervisor.sh → ...ata/docker-entrypoint.d/304-supervisor.sh
diff --git a/...ocker-entrypoint.d/35-custom-ini-files.sh → ...cker-entrypoint.d/305-custom-ini-files.sh b/...ocker-entrypoint.d/35-custom-ini-files.sh → ...cker-entrypoint.d/305-custom-ini-files.sh
diff --git a/...r-entrypoint.d/36-custom-php-fpm-files.sh → ...-entrypoint.d/306-custom-php-fpm-files.sh b/...r-entrypoint.d/36-custom-php-fpm-files.sh → ...-entrypoint.d/306-custom-php-fpm-files.sh
diff --git a/...r-entrypoint.d/37-fix-php-5.3-env-vars.sh → ...-entrypoint.d/307-fix-php-5.3-env-vars.sh b/...r-entrypoint.d/37-fix-php-5.3-env-vars.sh → ...-entrypoint.d/307-fix-php-5.3-env-vars.sh
diff --git a/.../docker-entrypoint.d/38-enable-modules.sh → ...docker-entrypoint.d/308-enable-modules.sh b/.../docker-entrypoint.d/38-enable-modules.sh → ...docker-entrypoint.d/308-enable-modules.sh
diff --git a/...docker-entrypoint.d/39-disable-modules.sh → ...ocker-entrypoint.d/309-disable-modules.sh b/...docker-entrypoint.d/39-disable-modules.sh → ...ocker-entrypoint.d/309-disable-modules.sh
diff --git a/Dockerfiles/prod/data/docker-entrypoint.d/310-custom-startup-scripts.sh b/Dockerfiles/prod/data/docker-entrypoint.d/310-custom-startup-scripts.sh
@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+
+set -e
+set -u
+set -o pipefail
+
+
+############################################################
+# Functions
+############################################################
+
+###
+### Execute custom uesr-supplied scripts
+###
+execute_custom_scripts() {
+	local script_dir="${1}"
+	local debug="${2}"
+
+	if [ ! -d "${script_dir}" ]; then
+		run "mkdir -p ${script_dir}" "${debug}"
+	fi
+	script_files="$( find "${script_dir}" -type f -iname '*.sh' )"
+
+	# loop over them line by line
+	IFS='
+	'
+	for script_f in ${script_files}; do
+		script_name="$( basename "${script_f}" )"
+		log "info" "Executing custom startup script: ${script_name}" "${debug}"
+		if ! bash "${script_f}"; then
+			log "err" "Failed to execute script" "${debug}"
+			exit 1
+		fi
+	done
+}
+
+
+############################################################
+# Sanity Checks
+############################################################
+
+if ! command -v find >/dev/null 2>&1; then
+	echo "find not found, but required."
+	exit 1
+fi
+if ! command -v basename >/dev/null 2>&1; then
+	echo "basename not found, but required."
+	exit 1
+fi
diff --git a/Dockerfiles/prod/data/docker-entrypoint.sh b/Dockerfiles/prod/data/docker-entrypoint.sh
@@ -178,6 +178,13 @@ enable_modules "ENABLE_MODULES" "${DEBUG_LEVEL}"
 disable_modules "DISABLE_MODULES" "${DEBUG_LEVEL}"
 
 
+###
+### Run custom user supplied scripts
+###
+execute_custom_scripts "/startup.d" "${DEBUG_LEVEL}"
+
+
+###
 ###
 ### Startup
 ###

diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2
@@ -328,10 +328,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bashrc-devilbox.d
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /shared/backups
 VOLUME /var/log/php
 VOLUME /var/mail

diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3
@@ -371,10 +371,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bashrc-devilbox.d
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /shared/backups
 VOLUME /var/log/php
 VOLUME /var/mail

diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4
@@ -404,10 +404,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bashrc-devilbox.d
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /shared/backups
 VOLUME /var/log/php
 VOLUME /var/mail

diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5
@@ -418,10 +418,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bashrc-devilbox.d
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /shared/backups
 VOLUME /var/log/php
 VOLUME /var/mail

diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6
@@ -432,10 +432,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bashrc-devilbox.d
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /shared/backups
 VOLUME /var/log/php
 VOLUME /var/mail

diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0
@@ -432,10 +432,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bashrc-devilbox.d
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /shared/backups
 VOLUME /var/log/php
 VOLUME /var/mail

diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1
@@ -432,10 +432,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bashrc-devilbox.d
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /shared/backups
 VOLUME /var/log/php
 VOLUME /var/mail

diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2
@@ -432,10 +432,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bashrc-devilbox.d
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /shared/backups
 VOLUME /var/log/php
 VOLUME /var/mail

diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3
@@ -420,10 +420,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bashrc-devilbox.d
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /shared/backups
 VOLUME /var/log/php
 VOLUME /var/mail

diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4
@@ -420,10 +420,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bashrc-devilbox.d
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /shared/backups
 VOLUME /var/log/php
 VOLUME /var/mail

diff --git a/...ocker-entrypoint.d/40-mysqldump-secure.sh → ...cker-entrypoint.d/400-mysqldump-secure.sh b/...ocker-entrypoint.d/40-mysqldump-secure.sh → ...cker-entrypoint.d/400-mysqldump-secure.sh
diff --git a/...entrypoint.d/41-update-ca-certificates.sh → ...ntrypoint.d/401-update-ca-certificates.sh b/...entrypoint.d/41-update-ca-certificates.sh → ...ntrypoint.d/401-update-ca-certificates.sh
diff --git a/Dockerfiles/work/data/docker-entrypoint.sh b/Dockerfiles/work/data/docker-entrypoint.sh
@@ -206,6 +206,12 @@ run "chmod 0755 /shared/httpd" "${DEBUG_LEVEL}"
 update_ca_certificates "/ca" "${DEBUG_LEVEL}"
 
 
+###
+### Run custom user supplied scripts
+###
+execute_custom_scripts "/startup.d" "${DEBUG_LEVEL}"
+
+
 ###
 ### Startup
 ###

diff --git a/README.md b/README.md
@@ -760,7 +760,7 @@ Have a look at the following table to see all offered volumes for each Docker im
  </thead>
  <tbody>
   <tr>
-   <td rowspan="5"><strong>prod</strong><br/><br/><strong>work</strong></td>
+   <td rowspan="6"><strong>prod</strong><br/><br/><strong>work</strong></td>
    <td><code>/etc/php-custom.d</code></td>
    <td>Mount this directory into your host computer and add custom <code>\*.ini</code> files in order to alter php behaviour.</td>
   </tr>
@@ -772,6 +772,10 @@ Have a look at the following table to see all offered volumes for each Docker im
    <td><code>/etc/php-modules.d</code></td>
    <td>Mount this directory into your host computer and add custo <code>\*.so</code> files in order to add your php modules.<br/><br/><strong>Note:</strong>Your should then also provide a custom <code>\*.ini</code> file in order to actually load your custom provided module.</td>
   </tr>
+  <tr>
+   <td><code>/startup.d</code></td>
+   <td>Any executable scripts ending by <code>\*.sh</code> found in this directory will be executed during startup. This is useful to supply additional commands (such as installing custom software) when the container starts up.</td>
+  </tr>
   <tr>
    <td><code>/var/log/php</code></td>
    <td>When setting environment variable <code>DOCKER_LOGS</code> to <code>0</code>, log files will be available under this directory.</td>