Merge pull request #81 from devilbox/pspell

Re-enable pspell for PHP 7.0, 7.1, 7.2 and 7.3

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 describe --abbrev=0 --tags) \
+	&& git checkout v3.4.2 \
 	&& 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 describe --abbrev=0 --tags) \
+	&& git checkout v3.4.2 \
 	&& cd build && ./install \
 	&& docker-php-ext-enable phalcon \
 	&& (rm -rf /usr/local/lib/php/test/phalcon || true) \

Dockerfiles/mods/Dockerfile-7.0

@@ -39,6 +39,7 @@ ENV BUILD_DEPS \
 	libnghttp2-dev \
 	libpng-dev \
 	libpq-dev \
+	libpspell-dev \
 	librabbitmq-dev \
 	librdkafka-dev \
 	librecode-dev \
@@ -59,6 +60,7 @@ ENV BUILD_DEPS \
 	git
 
 ENV RUN_DEPS \
+	libaspell15 \
 	libc-client2007e \
 	libenchant1c2a \
 	libfbclient2 \
@@ -296,12 +298,17 @@ RUN set -x \
 # ---- Installing PHP Extension: phalcon ----
 	&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
 	&& cd /tmp/phalcon \
-	&& git checkout $(git describe --abbrev=0 --tags) \
+	&& git checkout v3.4.2 \
 	&& 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) \
@@ -546,6 +553,8 @@ RUN set -x \
 	&& 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$' \

Dockerfiles/mods/Dockerfile-7.1

@@ -39,6 +39,7 @@ ENV BUILD_DEPS \
 	libnghttp2-dev \
 	libpng-dev \
 	libpq-dev \
+	libpspell-dev \
 	librabbitmq-dev \
 	librdkafka-dev \
 	librecode-dev \
@@ -59,6 +60,7 @@ ENV BUILD_DEPS \
 	git
 
 ENV RUN_DEPS \
+	libaspell15 \
 	libc-client2007e \
 	libenchant1c2a \
 	libfbclient2 \
@@ -291,12 +293,17 @@ RUN set -x \
 # ---- Installing PHP Extension: phalcon ----
 	&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
 	&& cd /tmp/phalcon \
-	&& git checkout $(git describe --abbrev=0 --tags) \
+	&& git checkout v3.4.2 \
 	&& 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) \
@@ -543,6 +550,8 @@ 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$' \

Dockerfiles/mods/Dockerfile-7.2

@@ -39,6 +39,7 @@ ENV BUILD_DEPS \
 	libnghttp2-dev \
 	libpng-dev \
 	libpq-dev \
+	libpspell-dev \
 	librabbitmq-dev \
 	librdkafka-dev \
 	librecode-dev \
@@ -59,6 +60,7 @@ ENV BUILD_DEPS \
 	git
 
 ENV RUN_DEPS \
+	libaspell15 \
 	libc-client2007e \
 	libenchant1c2a \
 	libfbclient2 \
@@ -292,12 +294,17 @@ RUN set -x \
 # ---- Installing PHP Extension: phalcon ----
 	&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
 	&& cd /tmp/phalcon \
-	&& git checkout $(git describe --abbrev=0 --tags) \
+	&& git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | sed 's/^.*tags\///g' | grep -E '^v[.0-9]+$' | tail -1) \
 	&& 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) \
@@ -544,6 +551,8 @@ 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$' \

Dockerfiles/mods/Dockerfile-7.3

@@ -250,6 +250,15 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/pgsql || true) \
 	&& (rm -rf /usr/local/lib/php/doc/pgsql || true) \
 	\
+# ---- 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 | sed 's/^.*tags\///g' | grep -E '^v[.0-9]+$' | tail -1) \
+	&& 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) \
@@ -500,6 +509,8 @@ RUN set -x \
 	&& 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 '^phar$' \
 	&& php-fpm -m | grep -oiE '^phar$' \
 	&& php -m | grep -oiE '^posix$' \

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
 
 

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
 
 

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, 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>
+   <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, 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>
+   <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, 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>
+   <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, 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>
+   <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, 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.4</th>

build/ansible/group_vars/all.yml

@@ -1222,7 +1222,7 @@ extensions_available:
       build_dep: [libpq-dev]
       run_dep: [libpq5]
   phalcon:
-    disabled: [5.2, 7.3, 7.4]
+    disabled: [5.2, 7.4]
     5.3:
       type: git
       git_url: https://github.com/phalcon/cphalcon
@@ -1233,17 +1233,30 @@ extensions_available:
       git_url: https://github.com/phalcon/cphalcon
       git_ref: phalcon-v2.0.13
       command: cd build && ./install
-#    7.3:
-#      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')
-#      # TODO: Workaround to make it compile on PHP 7.3
-#      command: cd build && echo > php7/64bits/phalcon.zep.c && ./install
+    5.5:
+      type: git
+      git_url: https://github.com/phalcon/cphalcon
+      git_ref: v3.4.2
+      command: cd build && ./install
+    5.6:
+      type: git
+      git_url: https://github.com/phalcon/cphalcon
+      git_ref: v3.4.2
+      command: cd build && ./install
+    7.0:
+      type: git
+      git_url: https://github.com/phalcon/cphalcon
+      git_ref: v3.4.2
+      command: cd build && ./install
+    7.1:
+      type: git
+      git_url: https://github.com/phalcon/cphalcon
+      git_ref: v3.4.2
+      command: cd build && ./install
     all:
       type: git
       git_url: https://github.com/phalcon/cphalcon
-      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')
+      git_ref: $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | sed 's/^.*tags\///g' | grep -E '^v[.0-9]+$' | tail -1)
       command: cd build && ./install
   phar:
     # https://github.com/docker-library/php/issues/618
@@ -1259,7 +1272,6 @@ 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]