Merge pull request #80 from devilbox/release-0.61

Release v0.61

Dockerfiles/mods/Dockerfile-5.5

@@ -288,7 +288,7 @@ RUN set -x \
 # ---- Installing PHP Extension: phalcon ----
 	&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
 	&& cd /tmp/phalcon \
-	&& git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g') \
+	&& git checkout $(git describe --abbrev=0 --tags) \
 	&& cd build && ./install \
 	&& docker-php-ext-enable phalcon \
 	&& (rm -rf /usr/local/lib/php/test/phalcon || true) \

Dockerfiles/mods/Dockerfile-5.6

@@ -292,7 +292,7 @@ RUN set -x \
 # ---- Installing PHP Extension: phalcon ----
 	&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
 	&& cd /tmp/phalcon \
-	&& git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g') \
+	&& git checkout $(git describe --abbrev=0 --tags) \
 	&& cd build && ./install \
 	&& docker-php-ext-enable phalcon \
 	&& (rm -rf /usr/local/lib/php/test/phalcon || true) \

Dockerfiles/mods/Dockerfile-7.0

@@ -39,7 +39,6 @@ ENV BUILD_DEPS \
 	libnghttp2-dev \
 	libpng-dev \
 	libpq-dev \
-	libpspell-dev \
 	librabbitmq-dev \
 	librdkafka-dev \
 	librecode-dev \
@@ -54,12 +53,12 @@ ENV BUILD_DEPS \
 	libxslt-dev \
 	libzip-dev \
 	snmp \
+	unixodbc-dev \
 	zlib1g-dev \
 	ca-certificates \
 	git
 
 ENV RUN_DEPS \
-	libaspell15 \
 	libc-client2007e \
 	libenchant1c2a \
 	libfbclient2 \
@@ -83,6 +82,7 @@ ENV RUN_DEPS \
 	libxslt1.1 \
 	libzip4 \
 	snmp \
+	unixodbc \
 	ca-certificates
 
 
@@ -282,6 +282,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) \
@@ -290,17 +296,12 @@ RUN set -x \
 # ---- Installing PHP Extension: phalcon ----
 	&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
 	&& cd /tmp/phalcon \
-	&& git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g') \
+	&& git checkout $(git describe --abbrev=0 --tags) \
 	&& cd build && ./install \
 	&& docker-php-ext-enable phalcon \
 	&& (rm -rf /usr/local/lib/php/test/phalcon || true) \
 	&& (rm -rf /usr/local/lib/php/doc/phalcon || true) \
 	\
-# ---- Installing PHP Extension: pspell ----
-	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \
-	&& (rm -rf /usr/local/lib/php/test/pspell || true) \
-	&& (rm -rf /usr/local/lib/php/doc/pspell || true) \
-	\
 # ---- Installing PHP Extension: recode ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
 	&& (rm -rf /usr/local/lib/php/test/recode || true) \
@@ -340,6 +341,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,14 +538,14 @@ 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$' \
 	&& php-fpm -m | grep -oiE '^phalcon$' \
 	&& php -m | grep -oiE '^posix$' \
 	&& php-fpm -m | grep -oiE '^posix$' \
-	&& php -m | grep -oiE '^pspell$' \
-	&& php-fpm -m | grep -oiE '^pspell$' \
 	&& php -m | grep -oiE '^readline$' \
 	&& php-fpm -m | grep -oiE '^readline$' \
 	&& php -m | grep -oiE '^recode$' \
@@ -561,6 +568,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

@@ -39,7 +39,6 @@ ENV BUILD_DEPS \
 	libnghttp2-dev \
 	libpng-dev \
 	libpq-dev \
-	libpspell-dev \
 	librabbitmq-dev \
 	librdkafka-dev \
 	librecode-dev \
@@ -54,12 +53,12 @@ ENV BUILD_DEPS \
 	libxslt-dev \
 	libzip-dev \
 	snmp \
+	unixodbc-dev \
 	zlib1g-dev \
 	ca-certificates \
 	git
 
 ENV RUN_DEPS \
-	libaspell15 \
 	libc-client2007e \
 	libenchant1c2a \
 	libfbclient2 \
@@ -83,6 +82,7 @@ ENV RUN_DEPS \
 	libxslt1.1 \
 	libzip4 \
 	snmp \
+	unixodbc \
 	ca-certificates
 
 
@@ -277,6 +277,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) \
@@ -285,17 +291,12 @@ RUN set -x \
 # ---- Installing PHP Extension: phalcon ----
 	&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
 	&& cd /tmp/phalcon \
-	&& git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g') \
+	&& git checkout $(git describe --abbrev=0 --tags) \
 	&& cd build && ./install \
 	&& docker-php-ext-enable phalcon \
 	&& (rm -rf /usr/local/lib/php/test/phalcon || true) \
 	&& (rm -rf /usr/local/lib/php/doc/phalcon || true) \
 	\
-# ---- Installing PHP Extension: pspell ----
-	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \
-	&& (rm -rf /usr/local/lib/php/test/pspell || true) \
-	&& (rm -rf /usr/local/lib/php/doc/pspell || true) \
-	\
 # ---- Installing PHP Extension: recode ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
 	&& (rm -rf /usr/local/lib/php/test/recode || true) \
@@ -335,6 +336,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 +533,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$' \
@@ -534,8 +543,6 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^phar$' \
 	&& php -m | grep -oiE '^posix$' \
 	&& php-fpm -m | grep -oiE '^posix$' \
-	&& php -m | grep -oiE '^pspell$' \
-	&& php-fpm -m | grep -oiE '^pspell$' \
 	&& php -m | grep -oiE '^readline$' \
 	&& php-fpm -m | grep -oiE '^readline$' \
 	&& php -m | grep -oiE '^recode$' \
@@ -558,6 +565,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

@@ -39,7 +39,6 @@ ENV BUILD_DEPS \
 	libnghttp2-dev \
 	libpng-dev \
 	libpq-dev \
-	libpspell-dev \
 	librabbitmq-dev \
 	librdkafka-dev \
 	librecode-dev \
@@ -54,12 +53,12 @@ ENV BUILD_DEPS \
 	libxslt-dev \
 	libzip-dev \
 	snmp \
+	unixodbc-dev \
 	zlib1g-dev \
 	ca-certificates \
 	git
 
 ENV RUN_DEPS \
-	libaspell15 \
 	libc-client2007e \
 	libenchant1c2a \
 	libfbclient2 \
@@ -83,6 +82,7 @@ ENV RUN_DEPS \
 	libxslt1.1 \
 	libzip4 \
 	snmp \
+	unixodbc \
 	ca-certificates
 
 
@@ -278,6 +278,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) \
@@ -286,17 +292,12 @@ RUN set -x \
 # ---- Installing PHP Extension: phalcon ----
 	&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
 	&& cd /tmp/phalcon \
-	&& git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g') \
+	&& git checkout $(git describe --abbrev=0 --tags) \
 	&& cd build && ./install \
 	&& docker-php-ext-enable phalcon \
 	&& (rm -rf /usr/local/lib/php/test/phalcon || true) \
 	&& (rm -rf /usr/local/lib/php/doc/phalcon || true) \
 	\
-# ---- Installing PHP Extension: pspell ----
-	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \
-	&& (rm -rf /usr/local/lib/php/test/pspell || true) \
-	&& (rm -rf /usr/local/lib/php/doc/pspell || true) \
-	\
 # ---- Installing PHP Extension: recode ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
 	&& (rm -rf /usr/local/lib/php/test/recode || true) \
@@ -336,6 +337,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 +534,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$' \
@@ -535,8 +544,6 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^phar$' \
 	&& php -m | grep -oiE '^posix$' \
 	&& php-fpm -m | grep -oiE '^posix$' \
-	&& php -m | grep -oiE '^pspell$' \
-	&& php-fpm -m | grep -oiE '^pspell$' \
 	&& php -m | grep -oiE '^readline$' \
 	&& php-fpm -m | grep -oiE '^readline$' \
 	&& php -m | grep -oiE '^recode$' \
@@ -561,6 +568,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

@@ -16,38 +16,38 @@ set -p pipefail
 #   MY_GID
 
 # Path to scripts to source
-CONFIG_DIR="/docker-entrypoint.d"
+DVL_CONFIG_DIR="/docker-entrypoint.d"
 
 # php.ini.d directory
-PHP_INI_DIR="/usr/local/etc/php/conf.d"
+DVL_PHP_INI_DIR="/usr/local/etc/php/conf.d"
 
 # php-fpm conf.d directory
-PHP_FPM_DIR="/usr/local/etc/php-fpm.d"
+DVL_PHP_FPM_DIR="/usr/local/etc/php-fpm.d"
 
 # This is the log file for any mail related functions
-PHP_MAIL_LOG="/var/log/mail.log"
+DVL_PHP_MAIL_LOG="/var/log/mail.log"
 
 # This file holds error and access log definitions
-PHP_FPM_CONF_LOGFILE="${PHP_FPM_DIR}/zzz-entrypoint-logfiles.conf"
-PHP_INI_CONF_LOGFILE="${PHP_INI_DIR}/zzz-entrypoint-logfiles.ini"
+DVL_PHP_FPM_CONF_LOGFILE="${DVL_PHP_FPM_DIR}/zzz-entrypoint-logfiles.conf"
+DVL_PHP_INI_CONF_LOGFILE="${DVL_PHP_INI_DIR}/zzz-entrypoint-logfiles.ini"
 
 # PHP-FPM log dir
-FPM_LOG_DIR="/var/log/php"
+DVL_FPM_LOG_DIR="/var/log/php"
 
 # Custom ini dir (to be copied to actual ini dir)
-PHP_CUST_INI_DIR="/etc/php-custom.d"
+DVL_PHP_CUST_INI_DIR="/etc/php-custom.d"
 
 # Custom PHP-FPM dir (to be copied to actual FPM conf dir)
-PHP_CUST_FPM_DIR="/etc/php-fpm-custom.d"
+DVL_PHP_CUST_FPM_DIR="/etc/php-fpm-custom.d"
 
 # Supervisord config directory
-SUPERVISOR_CONFD="/etc/supervisor/conf.d"
+DVL_SUPERVISOR_CONFD="/etc/supervisor/conf.d"
 
 
 ###
 ### Source libs
 ###
-init="$( find "${CONFIG_DIR}" -name '*.sh' -type f | sort -u )"
+init="$( find "${DVL_CONFIG_DIR}" -name '*.sh' -type f | sort -u )"
 for f in ${init}; do
 	# shellcheck disable=SC1090
 	. "${f}"
@@ -76,7 +76,7 @@ set_gid "NEW_GID" "${MY_GROUP}" "/home/${MY_USER}" "${DEBUG_LEVEL}"
 ###
 ### Set timezone
 ###
-set_timezone "TIMEZONE" "${PHP_INI_DIR}" "${DEBUG_LEVEL}"
+set_timezone "TIMEZONE" "${DVL_PHP_INI_DIR}" "${DEBUG_LEVEL}"
 
 
 ###
@@ -92,9 +92,9 @@ fi
 ###
 set_docker_logs \
 	"DOCKER_LOGS" \
-	"${FPM_LOG_DIR}" \
-	"${PHP_FPM_CONF_LOGFILE}" \
-	"${PHP_INI_CONF_LOGFILE}" \
+	"${DVL_FPM_LOG_DIR}" \
+	"${DVL_PHP_FPM_CONF_LOGFILE}" \
+	"${DVL_PHP_INI_CONF_LOGFILE}" \
 	"${MY_USER}" \
 	"${MY_GROUP}" \
 	"${DEBUG_LEVEL}"
@@ -105,10 +105,10 @@ set_docker_logs \
 ###
 if is_docker_logs_enabled "DOCKER_LOGS" >/dev/null; then
 	# PHP mail function should log to stderr
-	set_postfix "ENABLE_MAIL" "${MY_USER}" "${MY_GROUP}" "${PHP_INI_DIR}" "/proc/self/fd/2" "1" "${DEBUG_LEVEL}"
+	set_postfix "ENABLE_MAIL" "${MY_USER}" "${MY_GROUP}" "${DVL_PHP_INI_DIR}" "/proc/self/fd/2" "1" "${DEBUG_LEVEL}"
 else
 	# PHP mail function should log to file
-	set_postfix "ENABLE_MAIL" "${MY_USER}" "${MY_GROUP}" "${PHP_INI_DIR}" "${PHP_MAIL_LOG}" "0" "${DEBUG_LEVEL}"
+	set_postfix "ENABLE_MAIL" "${MY_USER}" "${MY_GROUP}" "${DVL_PHP_INI_DIR}" "${DVL_PHP_MAIL_LOG}" "0" "${DEBUG_LEVEL}"
 fi
 
 
@@ -130,7 +130,7 @@ for line in $( port_forward_get_lines "FORWARD_PORTS_TO_LOCALHOST" ); do
 	supervisor_add_service \
 		"socat-${lport}-${rhost}-${rport}" \
 		"/usr/bin/socat tcp-listen:${lport},reuseaddr,fork tcp:${rhost}:${rport}" \
-		"${SUPERVISOR_CONFD}" \
+		"${DVL_SUPERVISOR_CONFD}" \
 		"${DEBUG_LEVEL}"
 done
 
@@ -139,30 +139,30 @@ done
 ### Supervisor: rsyslogd & postfix
 ###
 if [ "$( env_get "ENABLE_MAIL" )" = "1" ]; then
-	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}"
+	supervisor_add_service "rsyslogd" "/usr/sbin/rsyslogd -n"      "${DVL_SUPERVISOR_CONFD}" "${DEBUG_LEVEL}" "1"
+	supervisor_add_service "postfix"  "/usr/local/sbin/postfix.sh" "${DVL_SUPERVISOR_CONFD}" "${DEBUG_LEVEL}"
 fi
 
 
 ###
 ### Supervisor: php-fpm
 ###
-supervisor_add_service "php-fpm"  "/usr/local/sbin/php-fpm" "${SUPERVISOR_CONFD}" "${DEBUG_LEVEL}"
+supervisor_add_service "php-fpm"  "/usr/local/sbin/php-fpm" "${DVL_SUPERVISOR_CONFD}" "${DEBUG_LEVEL}"
 
 
 ###
 ### Copy custom *.ini files
 ###
-copy_ini_files "${PHP_CUST_INI_DIR}" "${PHP_INI_DIR}" "${DEBUG_LEVEL}"
+copy_ini_files "${DVL_PHP_CUST_INI_DIR}" "${DVL_PHP_INI_DIR}" "${DEBUG_LEVEL}"
 
 
 ###
 ### Copy custom PHP-FPM *.conf files
 ###
 if [ "${PHP_VERSION}" = "5.2" ]; then
-	copy_fpm_5_2_conf_file "${PHP_CUST_FPM_DIR}/php-fpm.xml" "${DEBUG_LEVEL}"
+	copy_fpm_5_2_conf_file "${DVL_PHP_CUST_FPM_DIR}/php-fpm.xml" "${DEBUG_LEVEL}"
 else
-	copy_fpm_files "${PHP_CUST_FPM_DIR}" "${PHP_FPM_DIR}" "${DEBUG_LEVEL}"
+	copy_fpm_files "${DVL_PHP_CUST_FPM_DIR}" "${DVL_PHP_FPM_DIR}" "${DEBUG_LEVEL}"
 fi
 
 
@@ -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

@@ -27,18 +27,19 @@ RUN set -x \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+		curl \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
 	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
 	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add - \
+	&& curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://deb.nodesource.com/node_8.x jessie main" > /etc/apt/sources.list.d/node.list \
-	&& curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add - \
+	&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -51,7 +52,6 @@ RUN set -x \
 		build-essential \
 		bzip2 \
 		coreutils \
-		curl \
 		dnsutils \
 		dos2unix \
 		file \
@@ -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

@@ -27,18 +27,19 @@ RUN set -x \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+		curl \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
 	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
 	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add - \
+	&& curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://deb.nodesource.com/node_8.x jessie main" > /etc/apt/sources.list.d/node.list \
-	&& curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add - \
+	&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -51,7 +52,6 @@ RUN set -x \
 		build-essential \
 		bzip2 \
 		coreutils \
-		curl \
 		dnsutils \
 		dos2unix \
 		file \
@@ -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

@@ -27,18 +27,19 @@ RUN set -x \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+		curl \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
 	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
 	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add - \
+	&& curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://deb.nodesource.com/node_8.x jessie main" > /etc/apt/sources.list.d/node.list \
-	&& curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add - \
+	&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -51,7 +52,6 @@ RUN set -x \
 		build-essential \
 		bzip2 \
 		coreutils \
-		curl \
 		dnsutils \
 		dos2unix \
 		file \
@@ -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

@@ -27,18 +27,19 @@ RUN set -x \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+		curl \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
 	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
 	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add - \
+	&& curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://deb.nodesource.com/node_8.x jessie main" > /etc/apt/sources.list.d/node.list \
-	&& curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add - \
+	&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -51,7 +52,6 @@ RUN set -x \
 		build-essential \
 		bzip2 \
 		coreutils \
-		curl \
 		dnsutils \
 		dos2unix \
 		file \
@@ -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

@@ -27,18 +27,19 @@ RUN set -x \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+		curl \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
 	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
 	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add - \
+	&& curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://deb.nodesource.com/node_8.x jessie main" > /etc/apt/sources.list.d/node.list \
-	&& curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add - \
+	&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -51,7 +52,6 @@ RUN set -x \
 		build-essential \
 		bzip2 \
 		coreutils \
-		curl \
 		dnsutils \
 		dos2unix \
 		file \
@@ -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

@@ -27,18 +27,19 @@ RUN set -x \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+		curl \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
 	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
 	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add - \
+	&& curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://deb.nodesource.com/node_8.x jessie main" > /etc/apt/sources.list.d/node.list \
-	&& curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add - \
+	&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -51,7 +52,6 @@ RUN set -x \
 		build-essential \
 		bzip2 \
 		coreutils \
-		curl \
 		dnsutils \
 		dos2unix \
 		file \
@@ -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

@@ -27,18 +27,19 @@ RUN set -x \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+		curl \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
 	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
 	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add - \
+	&& curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://deb.nodesource.com/node_8.x jessie main" > /etc/apt/sources.list.d/node.list \
-	&& curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add - \
+	&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -51,7 +52,6 @@ RUN set -x \
 		build-essential \
 		bzip2 \
 		coreutils \
-		curl \
 		dnsutils \
 		dos2unix \
 		file \
@@ -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

@@ -27,18 +27,19 @@ RUN set -x \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+		curl \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
 	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
 	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add - \
+	&& curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/node.list \
-	&& curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add - \
+	&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -51,7 +52,6 @@ RUN set -x \
 		build-essential \
 		bzip2 \
 		coreutils \
-		curl \
 		dnsutils \
 		dos2unix \
 		file \
@@ -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

@@ -27,18 +27,19 @@ RUN set -x \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+		curl \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
 	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
 	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add - \
+	&& curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/node.list \
-	&& curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add - \
+	&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -51,7 +52,6 @@ RUN set -x \
 		build-essential \
 		bzip2 \
 		coreutils \
-		curl \
 		dnsutils \
 		dos2unix \
 		file \
@@ -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

@@ -27,18 +27,19 @@ RUN set -x \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+		curl \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
 	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
 	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add - \
+	&& curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/node.list \
-	&& curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add - \
+	&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -51,7 +52,6 @@ RUN set -x \
 		build-essential \
 		bzip2 \
 		coreutils \
-		curl \
 		dnsutils \
 		dos2unix \
 		file \
@@ -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

@@ -16,38 +16,38 @@ set -p pipefail
 #   MY_GID
 
 # Path to scripts to source
-CONFIG_DIR="/docker-entrypoint.d"
+DVL_CONFIG_DIR="/docker-entrypoint.d"
 
 # php.ini.d directory
-PHP_INI_DIR="/usr/local/etc/php/conf.d"
+DVL_PHP_INI_DIR="/usr/local/etc/php/conf.d"
 
 # php-fpm conf.d directory
-PHP_FPM_DIR="/usr/local/etc/php-fpm.d"
+DVL_PHP_FPM_DIR="/usr/local/etc/php-fpm.d"
 
 # This is the log file for any mail related functions
-PHP_MAIL_LOG="/var/log/mail.log"
+DVL_PHP_MAIL_LOG="/var/log/mail.log"
 
 # This file holds error and access log definitions
-PHP_FPM_CONF_LOGFILE="${PHP_FPM_DIR}/zzz-entrypoint-logfiles.conf"
-PHP_INI_CONF_LOGFILE="${PHP_INI_DIR}/zzz-entrypoint-logfiles.ini"
+DVL_PHP_FPM_CONF_LOGFILE="${DVL_PHP_FPM_DIR}/zzz-entrypoint-logfiles.conf"
+DVL_PHP_INI_CONF_LOGFILE="${DVL_PHP_INI_DIR}/zzz-entrypoint-logfiles.ini"
 
 # PHP-FPM log dir
-FPM_LOG_DIR="/var/log/php"
+DVL_FPM_LOG_DIR="/var/log/php"
 
 # Custom ini dir (to be copied to actual ini dir)
-PHP_CUST_INI_DIR="/etc/php-custom.d"
+DVL_PHP_CUST_INI_DIR="/etc/php-custom.d"
 
 # Custom PHP-FPM dir (to be copied to actual FPM conf dir)
-PHP_CUST_FPM_DIR="/etc/php-fpm-custom.d"
+DVL_PHP_CUST_FPM_DIR="/etc/php-fpm-custom.d"
 
 # Supervisord config directory
-SUPERVISOR_CONFD="/etc/supervisor/conf.d"
+DVL_SUPERVISOR_CONFD="/etc/supervisor/conf.d"
 
 
 ###
 ### Source libs
 ###
-init="$( find "${CONFIG_DIR}" -name '*.sh' -type f | sort -u )"
+init="$( find "${DVL_CONFIG_DIR}" -name '*.sh' -type f | sort -u )"
 for f in ${init}; do
 	# shellcheck disable=SC1090
 	. "${f}"
@@ -76,7 +76,7 @@ set_gid "NEW_GID" "${MY_GROUP}" "/home/${MY_USER}" "${DEBUG_LEVEL}"
 ###
 ### Set timezone
 ###
-set_timezone "TIMEZONE" "${PHP_INI_DIR}" "${DEBUG_LEVEL}"
+set_timezone "TIMEZONE" "${DVL_PHP_INI_DIR}" "${DEBUG_LEVEL}"
 
 
 ###
@@ -92,9 +92,9 @@ fi
 ###
 set_docker_logs \
 	"DOCKER_LOGS" \
-	"${FPM_LOG_DIR}" \
-	"${PHP_FPM_CONF_LOGFILE}" \
-	"${PHP_INI_CONF_LOGFILE}" \
+	"${DVL_FPM_LOG_DIR}" \
+	"${DVL_PHP_FPM_CONF_LOGFILE}" \
+	"${DVL_PHP_INI_CONF_LOGFILE}" \
 	"${MY_USER}" \
 	"${MY_GROUP}" \
 	"${DEBUG_LEVEL}"
@@ -105,10 +105,10 @@ set_docker_logs \
 ###
 if is_docker_logs_enabled "DOCKER_LOGS" >/dev/null; then
 	# PHP mail function should log to stderr
-	set_postfix "ENABLE_MAIL" "${MY_USER}" "${MY_GROUP}" "${PHP_INI_DIR}" "/proc/self/fd/2" "1" "${DEBUG_LEVEL}"
+	set_postfix "ENABLE_MAIL" "${MY_USER}" "${MY_GROUP}" "${DVL_PHP_INI_DIR}" "/proc/self/fd/2" "1" "${DEBUG_LEVEL}"
 else
 	# PHP mail function should log to file
-	set_postfix "ENABLE_MAIL" "${MY_USER}" "${MY_GROUP}" "${PHP_INI_DIR}" "${PHP_MAIL_LOG}" "0" "${DEBUG_LEVEL}"
+	set_postfix "ENABLE_MAIL" "${MY_USER}" "${MY_GROUP}" "${DVL_PHP_INI_DIR}" "${DVL_PHP_MAIL_LOG}" "0" "${DEBUG_LEVEL}"
 fi
 
 
@@ -130,7 +130,7 @@ for line in $( port_forward_get_lines "FORWARD_PORTS_TO_LOCALHOST" ); do
 	supervisor_add_service \
 		"socat-${lport}-${rhost}-${rport}" \
 		"/usr/bin/socat tcp-listen:${lport},reuseaddr,fork tcp:${rhost}:${rport}" \
-		"${SUPERVISOR_CONFD}" \
+		"${DVL_SUPERVISOR_CONFD}" \
 		"${DEBUG_LEVEL}"
 done
 
@@ -139,30 +139,30 @@ done
 ### Supervisor: rsyslogd & postfix
 ###
 if [ "$( env_get "ENABLE_MAIL" )" = "1" ]; then
-	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}"
+	supervisor_add_service "rsyslogd" "/usr/sbin/rsyslogd -n"      "${DVL_SUPERVISOR_CONFD}" "${DEBUG_LEVEL}" "1"
+	supervisor_add_service "postfix"  "/usr/local/sbin/postfix.sh" "${DVL_SUPERVISOR_CONFD}" "${DEBUG_LEVEL}"
 fi
 
 
 ###
 ### Supervisor: php-fpm
 ###
-supervisor_add_service "php-fpm"  "/usr/local/sbin/php-fpm" "${SUPERVISOR_CONFD}" "${DEBUG_LEVEL}"
+supervisor_add_service "php-fpm"  "/usr/local/sbin/php-fpm" "${DVL_SUPERVISOR_CONFD}" "${DEBUG_LEVEL}"
 
 
 ###
 ### Copy custom *.ini files
 ###
-copy_ini_files "${PHP_CUST_INI_DIR}" "${PHP_INI_DIR}" "${DEBUG_LEVEL}"
+copy_ini_files "${DVL_PHP_CUST_INI_DIR}" "${DVL_PHP_INI_DIR}" "${DEBUG_LEVEL}"
 
 
 ###
 ### Copy custom PHP-FPM *.conf files
 ###
 if [ "${PHP_VERSION}" = "5.2" ]; then
-	copy_fpm_5_2_conf_file "${PHP_CUST_FPM_DIR}/php-fpm.xml" "${DEBUG_LEVEL}"
+	copy_fpm_5_2_conf_file "${DVL_PHP_CUST_FPM_DIR}/php-fpm.xml" "${DEBUG_LEVEL}"
 else
-copy_fpm_files "${PHP_CUST_FPM_DIR}" "${PHP_FPM_DIR}" "${DEBUG_LEVEL}"
+copy_fpm_files "${DVL_PHP_CUST_FPM_DIR}" "${DVL_PHP_FPM_DIR}" "${DEBUG_LEVEL}"
 fi
 
 
@@ -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, 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, 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, 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

@@ -27,6 +27,7 @@ RUN set -x \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+		curl \
 		dirmngr \
 		gnupg \
 {% for repo in apt_repositories_enabled -%}
@@ -43,11 +44,11 @@ RUN set -x \
 		{%- endif -%}
 		{#- Version specific key available? -#}
 		{%- if php_version in apt_repositories_available[repo] and 'key' in apt_repositories_available[repo][php_version] %}
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv {{ apt_repositories_available[repo][php_version]['key'] }} \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv {{ apt_repositories_available[repo][php_version]['key'] }} \
 {# #}
 		{#- Generic key available? -#}
 		{%- elif 'all' in apt_repositories_available[repo] and 'key' in apt_repositories_available[repo]['all'] %}
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv {{ apt_repositories_available[repo]['all']['key'] }} \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv {{ apt_repositories_available[repo]['all']['key'] }} \
 {# #}
 		{%- endif -%}
 		{#- Version specific repository available? -#}
@@ -72,7 +73,6 @@ RUN set -x \
 		build-essential \
 		bzip2 \
 		coreutils \
-		curl \
 		dnsutils \
 		dos2unix \
 		file \
@@ -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

@@ -268,7 +268,7 @@ apt_repositories_available:
       deb: deb http://deb.nodesource.com/node_8.x stretch main
     all:
       deb: deb http://deb.nodesource.com/node_8.x jessie main
-      pre: curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add -
+      pre: curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
   pgsql:
     7.2:
       deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main
@@ -278,11 +278,11 @@ apt_repositories_available:
       deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main
     all:
       deb: deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main
-      pre: curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add -
+      pre: curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
   yarn:
     all:
       deb: deb http://dl.yarnpkg.com/debian/ stable main
-      pre: curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+      pre: curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
 
 
 ###
@@ -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
@@ -1229,7 +1242,8 @@ extensions_available:
     all:
       type: git
       git_url: https://github.com/phalcon/cphalcon
-      git_ref: $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g')
+      git_ref: $(git describe --abbrev=0 --tags)
+      #git_ref: $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g')
       command: cd build && ./install
   phar:
     # https://github.com/docker-library/php/issues/618
@@ -1245,6 +1259,7 @@ extensions_available:
     all:
       type: builtin
   pspell:
+    disabled: [7.0, 7.1, 7.2] # TODO: currently segfaults (https://bugs.php.net/bug.php?id=77099)
     all:
       type: builtin
       build_dep: [libpspell-dev]
@@ -1325,6 +1340,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}"