Merge pull request #78 from devilbox/release-0.59

Custom startup scripts

Dockerfiles/mods/Dockerfile-7.0

@@ -54,6 +54,7 @@ ENV BUILD_DEPS \
 	libxslt-dev \
 	libzip-dev \
 	snmp \
+	unixodbc-dev \
 	zlib1g-dev \
 	ca-certificates \
 	git
@@ -83,6 +84,7 @@ ENV RUN_DEPS \
 	libxslt1.1 \
 	libzip4 \
 	snmp \
+	unixodbc \
 	ca-certificates
 
 
@@ -282,6 +284,12 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/pdo_pgsql || true) \
 	&& (rm -rf /usr/local/lib/php/doc/pdo_pgsql || true) \
 	\
+# ---- Installing PHP Extension: pdo_sqlsrv ----
+	&& pecl install pdo_sqlsrv \
+	&& docker-php-ext-enable pdo_sqlsrv \
+	&& (rm -rf /usr/local/lib/php/test/pdo_sqlsrv || true) \
+	&& (rm -rf /usr/local/lib/php/doc/pdo_sqlsrv || true) \
+	\
 # ---- Installing PHP Extension: pgsql ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \
 	&& (rm -rf /usr/local/lib/php/test/pgsql || true) \
@@ -340,6 +348,12 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/sockets || true) \
 	&& (rm -rf /usr/local/lib/php/doc/sockets || true) \
 	\
+# ---- Installing PHP Extension: sqlsrv ----
+	&& pecl install sqlsrv \
+	&& docker-php-ext-enable sqlsrv \
+	&& (rm -rf /usr/local/lib/php/test/sqlsrv || true) \
+	&& (rm -rf /usr/local/lib/php/doc/sqlsrv || true) \
+	\
 # ---- Installing PHP Extension: swoole ----
 	&& pecl install swoole \
 	&& docker-php-ext-enable swoole \
@@ -531,6 +545,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^pdo_pgsql$' \
 	&& php -m | grep -oiE '^pdo_sqlite$' \
 	&& php-fpm -m | grep -oiE '^pdo_sqlite$' \
+	&& php -m | grep -oiE '^pdo_sqlsrv$' \
+	&& php-fpm -m | grep -oiE '^pdo_sqlsrv$' \
 	&& php -m | grep -oiE '^pgsql$' \
 	&& php-fpm -m | grep -oiE '^pgsql$' \
 	&& php -m | grep -oiE '^phalcon$' \
@@ -561,6 +577,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^soap$' \
 	&& php -m | grep -oiE '^sockets$' \
 	&& php-fpm -m | grep -oiE '^sockets$' \
+	&& php -m | grep -oiE '^sqlsrv$' \
+	&& php-fpm -m | grep -oiE '^sqlsrv$' \
 	&& php -m | grep -oiE '^swoole$' \
 	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \

Dockerfiles/mods/Dockerfile-7.1

@@ -54,6 +54,7 @@ ENV BUILD_DEPS \
 	libxslt-dev \
 	libzip-dev \
 	snmp \
+	unixodbc-dev \
 	zlib1g-dev \
 	ca-certificates \
 	git
@@ -83,6 +84,7 @@ ENV RUN_DEPS \
 	libxslt1.1 \
 	libzip4 \
 	snmp \
+	unixodbc \
 	ca-certificates
 
 
@@ -277,6 +279,12 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/pdo_pgsql || true) \
 	&& (rm -rf /usr/local/lib/php/doc/pdo_pgsql || true) \
 	\
+# ---- Installing PHP Extension: pdo_sqlsrv ----
+	&& pecl install pdo_sqlsrv \
+	&& docker-php-ext-enable pdo_sqlsrv \
+	&& (rm -rf /usr/local/lib/php/test/pdo_sqlsrv || true) \
+	&& (rm -rf /usr/local/lib/php/doc/pdo_sqlsrv || true) \
+	\
 # ---- Installing PHP Extension: pgsql ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \
 	&& (rm -rf /usr/local/lib/php/test/pgsql || true) \
@@ -335,6 +343,12 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/sockets || true) \
 	&& (rm -rf /usr/local/lib/php/doc/sockets || true) \
 	\
+# ---- Installing PHP Extension: sqlsrv ----
+	&& pecl install sqlsrv \
+	&& docker-php-ext-enable sqlsrv \
+	&& (rm -rf /usr/local/lib/php/test/sqlsrv || true) \
+	&& (rm -rf /usr/local/lib/php/doc/sqlsrv || true) \
+	\
 # ---- Installing PHP Extension: swoole ----
 	&& pecl install swoole \
 	&& docker-php-ext-enable swoole \
@@ -526,6 +540,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^pdo_pgsql$' \
 	&& php -m | grep -oiE '^pdo_sqlite$' \
 	&& php-fpm -m | grep -oiE '^pdo_sqlite$' \
+	&& php -m | grep -oiE '^pdo_sqlsrv$' \
+	&& php-fpm -m | grep -oiE '^pdo_sqlsrv$' \
 	&& php -m | grep -oiE '^pgsql$' \
 	&& php-fpm -m | grep -oiE '^pgsql$' \
 	&& php -m | grep -oiE '^phalcon$' \
@@ -558,6 +574,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^soap$' \
 	&& php -m | grep -oiE '^sockets$' \
 	&& php-fpm -m | grep -oiE '^sockets$' \
+	&& php -m | grep -oiE '^sqlsrv$' \
+	&& php-fpm -m | grep -oiE '^sqlsrv$' \
 	&& php -m | grep -oiE '^swoole$' \
 	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \

Dockerfiles/mods/Dockerfile-7.2

@@ -54,6 +54,7 @@ ENV BUILD_DEPS \
 	libxslt-dev \
 	libzip-dev \
 	snmp \
+	unixodbc-dev \
 	zlib1g-dev \
 	ca-certificates \
 	git
@@ -83,6 +84,7 @@ ENV RUN_DEPS \
 	libxslt1.1 \
 	libzip4 \
 	snmp \
+	unixodbc \
 	ca-certificates
 
 
@@ -278,6 +280,12 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/pdo_pgsql || true) \
 	&& (rm -rf /usr/local/lib/php/doc/pdo_pgsql || true) \
 	\
+# ---- Installing PHP Extension: pdo_sqlsrv ----
+	&& pecl install pdo_sqlsrv \
+	&& docker-php-ext-enable pdo_sqlsrv \
+	&& (rm -rf /usr/local/lib/php/test/pdo_sqlsrv || true) \
+	&& (rm -rf /usr/local/lib/php/doc/pdo_sqlsrv || true) \
+	\
 # ---- Installing PHP Extension: pgsql ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \
 	&& (rm -rf /usr/local/lib/php/test/pgsql || true) \
@@ -336,6 +344,12 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/sockets || true) \
 	&& (rm -rf /usr/local/lib/php/doc/sockets || true) \
 	\
+# ---- Installing PHP Extension: sqlsrv ----
+	&& pecl install sqlsrv \
+	&& docker-php-ext-enable sqlsrv \
+	&& (rm -rf /usr/local/lib/php/test/sqlsrv || true) \
+	&& (rm -rf /usr/local/lib/php/doc/sqlsrv || true) \
+	\
 # ---- Installing PHP Extension: swoole ----
 	&& pecl install swoole \
 	&& docker-php-ext-enable swoole \
@@ -527,6 +541,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^pdo_pgsql$' \
 	&& php -m | grep -oiE '^pdo_sqlite$' \
 	&& php-fpm -m | grep -oiE '^pdo_sqlite$' \
+	&& php -m | grep -oiE '^pdo_sqlsrv$' \
+	&& php-fpm -m | grep -oiE '^pdo_sqlsrv$' \
 	&& php -m | grep -oiE '^pgsql$' \
 	&& php-fpm -m | grep -oiE '^pgsql$' \
 	&& php -m | grep -oiE '^phalcon$' \
@@ -561,6 +577,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^sockets$' \
 	&& php -m | grep -oiE '^sodium$' \
 	&& php-fpm -m | grep -oiE '^sodium$' \
+	&& php -m | grep -oiE '^sqlsrv$' \
+	&& php-fpm -m | grep -oiE '^sqlsrv$' \
 	&& php -m | grep -oiE '^swoole$' \
 	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \

Dockerfiles/mods/Dockerfile-7.3

@@ -54,6 +54,7 @@ ENV BUILD_DEPS \
 	libxslt-dev \
 	libzip-dev \
 	snmp \
+	unixodbc-dev \
 	zlib1g-dev \
 	ca-certificates \
 	git
@@ -82,6 +83,7 @@ ENV RUN_DEPS \
 	libxslt1.1 \
 	libzip4 \
 	snmp \
+	unixodbc \
 	ca-certificates
 
 
@@ -237,6 +239,12 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/pdo_pgsql || true) \
 	&& (rm -rf /usr/local/lib/php/doc/pdo_pgsql || true) \
 	\
+# ---- Installing PHP Extension: pdo_sqlsrv ----
+	&& pecl install pdo_sqlsrv-5.5.0preview \
+	&& docker-php-ext-enable pdo_sqlsrv \
+	&& (rm -rf /usr/local/lib/php/test/pdo_sqlsrv || true) \
+	&& (rm -rf /usr/local/lib/php/doc/pdo_sqlsrv || true) \
+	\
 # ---- Installing PHP Extension: pgsql ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \
 	&& (rm -rf /usr/local/lib/php/test/pgsql || true) \
@@ -286,6 +294,12 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/sockets || true) \
 	&& (rm -rf /usr/local/lib/php/doc/sockets || true) \
 	\
+# ---- Installing PHP Extension: sqlsrv ----
+	&& pecl install sqlsrv-5.5.0preview \
+	&& docker-php-ext-enable sqlsrv \
+	&& (rm -rf /usr/local/lib/php/test/sqlsrv || true) \
+	&& (rm -rf /usr/local/lib/php/doc/sqlsrv || true) \
+	\
 # ---- Installing PHP Extension: swoole ----
 	&& git clone https://github.com/swoole/swoole-src /tmp/swoole \
 	&& cd /tmp/swoole \
@@ -482,6 +496,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^pdo_pgsql$' \
 	&& php -m | grep -oiE '^pdo_sqlite$' \
 	&& php-fpm -m | grep -oiE '^pdo_sqlite$' \
+	&& php -m | grep -oiE '^pdo_sqlsrv$' \
+	&& php-fpm -m | grep -oiE '^pdo_sqlsrv$' \
 	&& php -m | grep -oiE '^pgsql$' \
 	&& php-fpm -m | grep -oiE '^pgsql$' \
 	&& php -m | grep -oiE '^phar$' \
@@ -514,6 +530,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^sockets$' \
 	&& php -m | grep -oiE '^sodium$' \
 	&& php-fpm -m | grep -oiE '^sodium$' \
+	&& php -m | grep -oiE '^sqlsrv$' \
+	&& php-fpm -m | grep -oiE '^sqlsrv$' \
 	&& php -m | grep -oiE '^swoole$' \
 	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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

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
 ###

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

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

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

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

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

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

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

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

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

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

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
 ###

README.md

@@ -551,22 +551,22 @@ Check out this table to see which Docker image provides what PHP modules.
   <tr>
    <th>7.0</th>
    <td id="70-base">Core, ctype, curl, date, dom, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib</td>
-   <td id="70-mods">amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
+   <td id="70-mods">amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
   </tr>
   <tr>
    <th>7.1</th>
    <td id="71-base">Core, ctype, curl, date, dom, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib</td>
-   <td id="71-mods">amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
+   <td id="71-mods">amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
   </tr>
   <tr>
    <th>7.2</th>
    <td id="72-base">Core, ctype, curl, date, dom, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, sodium, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib</td>
-   <td id="72-mods">amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
+   <td id="72-mods">amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
   </tr>
   <tr>
    <th>7.3</th>
    <td id="73-base">Core, ctype, curl, date, dom, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, sodium, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib</td>
-   <td id="73-mods">apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, json, ldap, libxml, mbstring, memcached, mongodb, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
+   <td id="73-mods">apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, json, ldap, libxml, mbstring, memcached, mongodb, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
   </tr>
   <tr>
    <th>7.4</th>
@@ -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>

build/ansible/DOCKERFILES/Dockerfile-prod.j2

@@ -24,6 +24,7 @@ RUN set -x \
 		locales-all \
 		postfix \
 		postfix-pcre \
+		cron \
 		rsyslog \
 		socat \
 		supervisor \
@@ -74,9 +75,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
 

build/ansible/DOCKERFILES/Dockerfile-work.j2

@@ -246,10 +246,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

build/ansible/group_vars/all.yml

@@ -719,6 +719,7 @@ extensions_enabled:
   - pdo_odbc
   - pdo_pgsql
   - pdo_sqlite
+  - pdo_sqlsrv
   - pgsql
   - phalcon
   - phar
@@ -737,6 +738,7 @@ extensions_enabled:
   - sockets
   - sodium
   - spl
+  - sqlsrv
   - swoole
   - sysvmsg
   - sysvsem
@@ -1203,6 +1205,17 @@ extensions_available:
     all:
       type: builtin
       build_dep: [libsqlite3-dev]
+  pdo_sqlsrv:
+    disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.4]
+    7.3:
+      type: pecl
+      version: 5.5.0preview
+      build_dep: [unixodbc-dev]
+      run_dep: [unixodbc]
+    all:
+      type: pecl
+      build_dep: [unixodbc-dev]
+      run_dep: [unixodbc]
   pgsql:
     all:
       type: builtin
@@ -1325,6 +1338,17 @@ extensions_available:
       build_dep: [libsodium-dev]
   spl:
     disabled: "{{ php_all_versions }}" # TODO: Did not work
+  sqlsrv:
+    disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.4]
+    7.3:
+      type: pecl
+      version: 5.5.0preview
+      build_dep: [unixodbc-dev]
+      run_dep: [unixodbc]
+    all:
+      type: pecl
+      build_dep: [unixodbc-dev]
+      run_dep: [unixodbc]
   swoole:
     disabled: [5.2]
     5.3:

tests/prod/08-test-custom-user-scripts.sh

@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+
+set -e
+set -u
+set -o pipefail
+
+CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
+
+IMAGE="${1}"
+VERSION="${2}"
+FLAVOUR="${3}"
+
+# shellcheck disable=SC1090
+. "${CWD}/../.lib.sh"
+
+
+
+############################################################
+# Tests
+############################################################
+
+###
+### Check if PHP still starts up with working scripts
+###
+RUN_SH_HOST="$( mktemp -d )"
+RUN_SH_CONT="/startup.d"
+
+# Fix mount permissions
+chmod 0777 "${RUN_SH_HOST}"
+
+# Add a startup script to execute
+printf "#!/bin/bash\\necho 'abcdefghijklmnopq';\\n" > "${RUN_SH_HOST}/myscript1.sh"
+chmod +x "${RUN_SH_HOST}/myscript1.sh"
+
+# Start PHP-FPM
+did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${RUN_SH_HOST}:${RUN_SH_CONT}" )"
+
+# Wait for both containers to be up and running
+run "sleep 10"
+
+# Check entrypoint for script run
+if ! run "docker logs ${did} | grep 'myscript1.sh'"; then
+	docker_logs "${did}"  || true
+	docker_stop "${did}"  || true
+	rm -rf "${RUN_SH_HOST}"
+	echo "Failed"
+	exit 1
+fi
+
+# Check entrypoint for script output
+if ! run "docker logs ${did} | grep 'abcdefghijklmnopq'"; then
+	docker_logs "${did}"  || true
+	docker_stop "${did}"  || true
+	rm -rf "${RUN_SH_HOST}"
+	echo "Failed"
+	exit 1
+fi
+
+
+# Cleanup
+docker_stop "${did}"
+rm -rf "${RUN_SH_HOST}"