Merge pull request #117 from devilbox/release-0.88

Feature update
devilbox · May 20, 2019 · e75b7cb · e75b7cb
2 parents 3075f2a + d68b8dc
commit e75b7cb
Show file tree

Hide file tree

Showing 27 changed files with 822 additions and 498 deletions.
diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2
@@ -35,6 +35,7 @@ ENV BUILD_DEPS \
 	libmagic-dev \
 	libmcrypt-dev \
 	libmemcached-dev \
+	libpcre3-dev \
 	libpng-dev \
 	libpq-dev \
 	libpspell-dev \
@@ -227,6 +228,12 @@ ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype
 	&& (rm -rf /usr/local/lib/php/test/mongo || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mongo || true) \
 	\
+# ---- Installing PHP Extension: oauth ----
+	&& pecl install oauth-1.2.3 \
+	&& docker-php-ext-enable oauth \
+	&& (rm -rf /usr/local/lib/php/test/oauth || true) \
+	&& (rm -rf /usr/local/lib/php/doc/oauth || true) \
+	\
 # ---- Installing PHP Extension: opcache ----
 	&& pecl install zendopcache \
 	&& docker-php-ext-enable opcache \
@@ -454,6 +461,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^mysql$' \
 	&& php -m | grep -oiE '^mysqli$' \
 	&& php-fpm -m | grep -oiE '^mysqli$' \
+	&& php -m | grep -oiE '^oauth$' \
+	&& php-fpm -m | grep -oiE '^oauth$' \
 	&& php -m | grep -oiE '^Zend Opcache$' \
 	&& php-fpm -m | grep -oiE '^Zend Opcache$' \
 	&& php -m | grep -oiE '^openssl$' \

diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3
@@ -39,6 +39,7 @@ ENV BUILD_DEPS \
 	libmcrypt-dev \
 	libmemcached-dev \
 	libnghttp2-dev \
+	libpcre3-dev \
 	libpng-dev \
 	libpq-dev \
 	libpspell-dev \
@@ -256,6 +257,12 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mysqli || true) \
 	\
+# ---- Installing PHP Extension: oauth ----
+	&& pecl install oauth-1.2.3 \
+	&& docker-php-ext-enable oauth \
+	&& (rm -rf /usr/local/lib/php/test/oauth || true) \
+	&& (rm -rf /usr/local/lib/php/doc/oauth || true) \
+	\
 # ---- Installing PHP Extension: oci8 ----
 	&& ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \
 && ORACLE_VERSION_MAJOR="$( echo "${ORACLE_HREF}" | grep -Eo 'instantclient[.0-9]+' | sed 's/instantclient//g' )" \
@@ -536,6 +543,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^mysqli$' \
 	&& php -m | grep -oiE '^mysqlnd$' \
 	&& php-fpm -m | grep -oiE '^mysqlnd$' \
+	&& php -m | grep -oiE '^oauth$' \
+	&& php-fpm -m | grep -oiE '^oauth$' \
 	&& php -m | grep -oiE '^oci8$' \
 	&& php-fpm -m | grep -oiE '^oci8$' \
 	&& php -m | grep -oiE '^Zend Opcache$' \

diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4
@@ -39,6 +39,7 @@ ENV BUILD_DEPS \
 	libmcrypt-dev \
 	libmemcached-dev \
 	libnghttp2-dev \
+	libpcre3-dev \
 	libpng-dev \
 	libpq-dev \
 	libpspell-dev \
@@ -261,6 +262,12 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mysqli || true) \
 	\
+# ---- Installing PHP Extension: oauth ----
+	&& pecl install oauth-1.2.3 \
+	&& docker-php-ext-enable oauth \
+	&& (rm -rf /usr/local/lib/php/test/oauth || true) \
+	&& (rm -rf /usr/local/lib/php/doc/oauth || true) \
+	\
 # ---- Installing PHP Extension: oci8 ----
 	&& ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \
 && ORACLE_VERSION_MAJOR="$( echo "${ORACLE_HREF}" | grep -Eo 'instantclient[.0-9]+' | sed 's/instantclient//g' )" \
@@ -541,6 +548,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^mysqli$' \
 	&& php -m | grep -oiE '^mysqlnd$' \
 	&& php-fpm -m | grep -oiE '^mysqlnd$' \
+	&& php -m | grep -oiE '^oauth$' \
+	&& php-fpm -m | grep -oiE '^oauth$' \
 	&& php -m | grep -oiE '^oci8$' \
 	&& php-fpm -m | grep -oiE '^oci8$' \
 	&& php -m | grep -oiE '^Zend Opcache$' \

diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5
@@ -39,6 +39,7 @@ ENV BUILD_DEPS \
 	libmcrypt-dev \
 	libmemcached-dev \
 	libnghttp2-dev \
+	libpcre3-dev \
 	libpng-dev \
 	libpq-dev \
 	libpspell-dev \
@@ -251,6 +252,12 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mysqli || true) \
 	\
+# ---- Installing PHP Extension: oauth ----
+	&& pecl install oauth-1.2.3 \
+	&& docker-php-ext-enable oauth \
+	&& (rm -rf /usr/local/lib/php/test/oauth || true) \
+	&& (rm -rf /usr/local/lib/php/doc/oauth || true) \
+	\
 # ---- Installing PHP Extension: oci8 ----
 	&& ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \
 && ORACLE_VERSION_MAJOR="$( echo "${ORACLE_HREF}" | grep -Eo 'instantclient[.0-9]+' | sed 's/instantclient//g' )" \
@@ -535,6 +542,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^mysqli$' \
 	&& php -m | grep -oiE '^mysqlnd$' \
 	&& php-fpm -m | grep -oiE '^mysqlnd$' \
+	&& php -m | grep -oiE '^oauth$' \
+	&& php-fpm -m | grep -oiE '^oauth$' \
 	&& php -m | grep -oiE '^oci8$' \
 	&& php-fpm -m | grep -oiE '^oci8$' \
 	&& php -m | grep -oiE '^Zend Opcache$' \

diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6
@@ -39,6 +39,7 @@ ENV BUILD_DEPS \
 	libmcrypt-dev \
 	libmemcached-dev \
 	libnghttp2-dev \
+	libpcre3-dev \
 	libpng-dev \
 	libpq-dev \
 	libpspell-dev \
@@ -266,6 +267,12 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mysqli || true) \
 	\
+# ---- Installing PHP Extension: oauth ----
+	&& pecl install oauth-1.2.3 \
+	&& docker-php-ext-enable oauth \
+	&& (rm -rf /usr/local/lib/php/test/oauth || true) \
+	&& (rm -rf /usr/local/lib/php/doc/oauth || true) \
+	\
 # ---- Installing PHP Extension: oci8 ----
 	&& ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \
 && ORACLE_VERSION_MAJOR="$( echo "${ORACLE_HREF}" | grep -Eo 'instantclient[.0-9]+' | sed 's/instantclient//g' )" \
@@ -550,6 +557,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^mysqli$' \
 	&& php -m | grep -oiE '^mysqlnd$' \
 	&& php-fpm -m | grep -oiE '^mysqlnd$' \
+	&& php -m | grep -oiE '^oauth$' \
+	&& php-fpm -m | grep -oiE '^oauth$' \
 	&& php -m | grep -oiE '^oci8$' \
 	&& php-fpm -m | grep -oiE '^oci8$' \
 	&& php -m | grep -oiE '^Zend Opcache$' \

diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0
@@ -39,6 +39,7 @@ ENV BUILD_DEPS \
 	libmcrypt-dev \
 	libmemcached-dev \
 	libnghttp2-dev \
+	libpcre3-dev \
 	libpng-dev \
 	libpq-dev \
 	libpspell-dev \
@@ -262,6 +263,12 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mysqli || true) \
 	\
+# ---- Installing PHP Extension: oauth ----
+	&& pecl install oauth \
+	&& docker-php-ext-enable oauth \
+	&& (rm -rf /usr/local/lib/php/test/oauth || true) \
+	&& (rm -rf /usr/local/lib/php/doc/oauth || true) \
+	\
 # ---- Installing PHP Extension: oci8 ----
 	&& ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \
 && ORACLE_VERSION_MAJOR="$( echo "${ORACLE_HREF}" | grep -Eo 'instantclient[.0-9]+' | sed 's/instantclient//g' )" \
@@ -580,6 +587,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^mysqli$' \
 	&& php -m | grep -oiE '^mysqlnd$' \
 	&& php-fpm -m | grep -oiE '^mysqlnd$' \
+	&& php -m | grep -oiE '^oauth$' \
+	&& php-fpm -m | grep -oiE '^oauth$' \
 	&& php -m | grep -oiE '^oci8$' \
 	&& php-fpm -m | grep -oiE '^oci8$' \
 	&& php -m | grep -oiE '^Zend Opcache$' \

diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1
@@ -39,6 +39,7 @@ ENV BUILD_DEPS \
 	libmcrypt-dev \
 	libmemcached-dev \
 	libnghttp2-dev \
+	libpcre3-dev \
 	libpng-dev \
 	libpq-dev \
 	libpspell-dev \
@@ -262,6 +263,12 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mysqli || true) \
 	\
+# ---- Installing PHP Extension: oauth ----
+	&& pecl install oauth \
+	&& docker-php-ext-enable oauth \
+	&& (rm -rf /usr/local/lib/php/test/oauth || true) \
+	&& (rm -rf /usr/local/lib/php/doc/oauth || true) \
+	\
 # ---- Installing PHP Extension: oci8 ----
 	&& ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \
 && ORACLE_VERSION_MAJOR="$( echo "${ORACLE_HREF}" | grep -Eo 'instantclient[.0-9]+' | sed 's/instantclient//g' )" \
@@ -580,6 +587,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^mysqli$' \
 	&& php -m | grep -oiE '^mysqlnd$' \
 	&& php-fpm -m | grep -oiE '^mysqlnd$' \
+	&& php -m | grep -oiE '^oauth$' \
+	&& php-fpm -m | grep -oiE '^oauth$' \
 	&& php -m | grep -oiE '^oci8$' \
 	&& php-fpm -m | grep -oiE '^oci8$' \
 	&& php -m | grep -oiE '^Zend Opcache$' \

diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2
@@ -39,6 +39,7 @@ ENV BUILD_DEPS \
 	libmcrypt-dev \
 	libmemcached-dev \
 	libnghttp2-dev \
+	libpcre3-dev \
 	libpng-dev \
 	libpq-dev \
 	libpspell-dev \
@@ -263,6 +264,12 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mysqli || true) \
 	\
+# ---- Installing PHP Extension: oauth ----
+	&& pecl install oauth \
+	&& docker-php-ext-enable oauth \
+	&& (rm -rf /usr/local/lib/php/test/oauth || true) \
+	&& (rm -rf /usr/local/lib/php/doc/oauth || true) \
+	\
 # ---- Installing PHP Extension: oci8 ----
 	&& ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \
 && ORACLE_VERSION_MAJOR="$( echo "${ORACLE_HREF}" | grep -Eo 'instantclient[.0-9]+' | sed 's/instantclient//g' )" \
@@ -581,6 +588,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^mysqli$' \
 	&& php -m | grep -oiE '^mysqlnd$' \
 	&& php-fpm -m | grep -oiE '^mysqlnd$' \
+	&& php -m | grep -oiE '^oauth$' \
+	&& php-fpm -m | grep -oiE '^oauth$' \
 	&& php -m | grep -oiE '^oci8$' \
 	&& php-fpm -m | grep -oiE '^oci8$' \
 	&& php -m | grep -oiE '^Zend Opcache$' \

diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3
@@ -41,6 +41,7 @@ ENV BUILD_DEPS \
 	libmcrypt-dev \
 	libmemcached-dev \
 	libnghttp2-dev \
+	libpcre3-dev \
 	libpng-dev \
 	libpq-dev \
 	libpspell-dev \
@@ -232,6 +233,12 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mysqli || true) \
 	\
+# ---- Installing PHP Extension: oauth ----
+	&& pecl install oauth \
+	&& docker-php-ext-enable oauth \
+	&& (rm -rf /usr/local/lib/php/test/oauth || true) \
+	&& (rm -rf /usr/local/lib/php/doc/oauth || true) \
+	\
 # ---- Installing PHP Extension: oci8 ----
 	&& ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \
 && ORACLE_VERSION_MAJOR="$( echo "${ORACLE_HREF}" | grep -Eo 'instantclient[.0-9]+' | sed 's/instantclient//g' )" \
@@ -558,6 +565,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^mysqli$' \
 	&& php -m | grep -oiE '^mysqlnd$' \
 	&& php-fpm -m | grep -oiE '^mysqlnd$' \
+	&& php -m | grep -oiE '^oauth$' \
+	&& php-fpm -m | grep -oiE '^oauth$' \
 	&& php -m | grep -oiE '^oci8$' \
 	&& php-fpm -m | grep -oiE '^oci8$' \
 	&& php -m | grep -oiE '^Zend Opcache$' \

diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4
@@ -24,7 +24,6 @@ ENV BUILD_DEPS \
 	freetds-dev \
 	libaio-dev \
 	libbz2-dev \
-	libenchant-dev \
 	libevent-dev \
 	libfbclient2 \
 	libffi-dev \
@@ -60,7 +59,6 @@ ENV BUILD_DEPS \
 ENV RUN_DEPS \
 	libaio1 \
 	libaspell15 \
-	libenchant1c2a \
 	libfbclient2 \
 	libffi6 \
 	libfreetype6 \
@@ -114,11 +112,6 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/dba || true) \
 	&& (rm -rf /usr/local/lib/php/doc/dba || true) \
 	\
-# ---- Installing PHP Extension: enchant ----
-	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) enchant \
-	&& (rm -rf /usr/local/lib/php/test/enchant || true) \
-	&& (rm -rf /usr/local/lib/php/doc/enchant || true) \
-	\
 # ---- Installing PHP Extension: exif ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) exif \
 	&& (rm -rf /usr/local/lib/php/test/exif || true) \
@@ -442,8 +435,6 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^dba$' \
 	&& php -m | grep -oiE '^dom$' \
 	&& php-fpm -m | grep -oiE '^dom$' \
-	&& php -m | grep -oiE '^enchant$' \
-	&& php-fpm -m | grep -oiE '^enchant$' \
 	&& php -m | grep -oiE '^exif$' \
 	&& php-fpm -m | grep -oiE '^exif$' \
 	&& php -m | grep -oiE '^ffi$' \

diff --git a/Dockerfiles/mods/Dockerfile-8.0 b/Dockerfiles/mods/Dockerfile-8.0
@@ -23,7 +23,6 @@ ENV BUILD_DEPS \
 	freetds-dev \
 	libaio-dev \
 	libbz2-dev \
-	libenchant-dev \
 	libevent-dev \
 	libfbclient2 \
 	libffi-dev \
@@ -57,7 +56,6 @@ ENV BUILD_DEPS \
 ENV RUN_DEPS \
 	libaio1 \
 	libaspell15 \
-	libenchant1c2a \
 	libfbclient2 \
 	libffi6 \
 	libfreetype6 \
@@ -108,11 +106,6 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/dba || true) \
 	&& (rm -rf /usr/local/lib/php/doc/dba || true) \
 	\
-# ---- Installing PHP Extension: enchant ----
-	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) enchant \
-	&& (rm -rf /usr/local/lib/php/test/enchant || true) \
-	&& (rm -rf /usr/local/lib/php/doc/enchant || true) \
-	\
 # ---- Installing PHP Extension: exif ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) exif \
 	&& (rm -rf /usr/local/lib/php/test/exif || true) \
@@ -450,8 +443,6 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^dba$' \
 	&& php -m | grep -oiE '^dom$' \
 	&& php-fpm -m | grep -oiE '^dom$' \
-	&& php -m | grep -oiE '^enchant$' \
-	&& php-fpm -m | grep -oiE '^enchant$' \
 	&& php -m | grep -oiE '^exif$' \
 	&& php-fpm -m | grep -oiE '^exif$' \
 	&& php -m | grep -oiE '^ffi$' \

diff --git a/Dockerfiles/prod/data/docker-entrypoint.d/310-custom-startup-scripts.sh b/Dockerfiles/prod/data/docker-entrypoint.d/310-custom-startup-scripts.sh
@@ -19,7 +19,7 @@ execute_custom_scripts() {
 	if [ ! -d "${script_dir}" ]; then
 		run "mkdir -p ${script_dir}" "${debug}"
 	fi
-	script_files="$( find "${script_dir}" -type f -iname '*.sh' )"
+	script_files="$( find -L "${script_dir}" -type f -iname '*.sh' )"
 
 	# loop over them line by line
 	IFS='