Merge pull request #96 from devilbox/release-0.73

Fixes #75 Use latest xdebug version for PHP 7.3

.travis.yml

@@ -99,30 +99,30 @@ script:
       echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin &&
       if [ "${TRAVIS_BRANCH}" == "master" ]; then
         echo "Pushing latest";
-        docker push "${IMAGE}:${PHP}-base";
-        docker push "${IMAGE}:${PHP}-mods";
-        docker push "${IMAGE}:${PHP}-prod";
-        docker push "${IMAGE}:${PHP}-work";
+        until docker push "${IMAGE}:${PHP}-base"; do sleep 1; done;
+        until docker push "${IMAGE}:${PHP}-mods"; do sleep 1; done;
+        until docker push "${IMAGE}:${PHP}-prod"; do sleep 1; done;
+        until docker push "${IMAGE}:${PHP}-work"; do sleep 1; done;
       elif [[ ${TRAVIS_BRANCH} =~ ^(release-[.0-9]+)$ ]]; then
         echo "Pushing branch ${TRAVIS_BRANCH}";
         docker tag "${IMAGE}:${PHP}-base" "${IMAGE}:${PHP}-base-${TRAVIS_BRANCH}" &&
         docker tag "${IMAGE}:${PHP}-mods" "${IMAGE}:${PHP}-mods-${TRAVIS_BRANCH}" &&
         docker tag "${IMAGE}:${PHP}-prod" "${IMAGE}:${PHP}-prod-${TRAVIS_BRANCH}" &&
         docker tag "${IMAGE}:${PHP}-work" "${IMAGE}:${PHP}-work-${TRAVIS_BRANCH}" &&
-        docker push "${IMAGE}:${PHP}-base-${TRAVIS_BRANCH}";
-        docker push "${IMAGE}:${PHP}-mods-${TRAVIS_BRANCH}";
-        docker push "${IMAGE}:${PHP}-prod-${TRAVIS_BRANCH}";
-        docker push "${IMAGE}:${PHP}-work-${TRAVIS_BRANCH}";
+        until docker push "${IMAGE}:${PHP}-base-${TRAVIS_BRANCH}"; do sleep 1; done;
+        until docker push "${IMAGE}:${PHP}-mods-${TRAVIS_BRANCH}"; do sleep 1; done;
+        until docker push "${IMAGE}:${PHP}-prod-${TRAVIS_BRANCH}"; do sleep 1; done;
+        until docker push "${IMAGE}:${PHP}-work-${TRAVIS_BRANCH}"; do sleep 1; done;
       elif [ -n "${TRAVIS_TAG}" ]; then
         echo "Pushing tag ${TRAVIS_TAG}";
         docker tag "${IMAGE}:${PHP}-base" "${IMAGE}:${PHP}-base-${TRAVIS_TAG}" &&
         docker tag "${IMAGE}:${PHP}-mods" "${IMAGE}:${PHP}-mods-${TRAVIS_TAG}" &&
         docker tag "${IMAGE}:${PHP}-prod" "${IMAGE}:${PHP}-prod-${TRAVIS_TAG}" &&
         docker tag "${IMAGE}:${PHP}-work" "${IMAGE}:${PHP}-work-${TRAVIS_TAG}" &&
-        docker push "${IMAGE}:${PHP}-base-${TRAVIS_TAG}";
-        docker push "${IMAGE}:${PHP}-mods-${TRAVIS_TAG}";
-        docker push "${IMAGE}:${PHP}-prod-${TRAVIS_TAG}";
-        docker push "${IMAGE}:${PHP}-work-${TRAVIS_TAG}";
+        until docker push "${IMAGE}:${PHP}-base-${TRAVIS_TAG}"; do sleep 1; done;
+        until docker push "${IMAGE}:${PHP}-mods-${TRAVIS_TAG}"; do sleep 1; done;
+        until docker push "${IMAGE}:${PHP}-prod-${TRAVIS_TAG}"; do sleep 1; done;
+        until docker push "${IMAGE}:${PHP}-work-${TRAVIS_TAG}"; do sleep 1; done;
       elif [ "${TRAVIS_EVENT_TYPE}" = "cron" ]; then
         if MY_TAG="$( git describe --exact-match "$(git rev-parse HEAD)" 2>/dev/null )"; then
           echo "Pushing cron tag ${MY_TAG}";
@@ -130,10 +130,10 @@ script:
           docker tag "${IMAGE}:${PHP}-mods" "${IMAGE}:${PHP}-mods-${MY_TAG}" &&
           docker tag "${IMAGE}:${PHP}-prod" "${IMAGE}:${PHP}-prod-${MY_TAG}" &&
           docker tag "${IMAGE}:${PHP}-work" "${IMAGE}:${PHP}-work-${MY_TAG}" &&
-          docker push "${IMAGE}:${PHP}-base-${MY_TAG}";
-          docker push "${IMAGE}:${PHP}-mods-${MY_TAG}";
-          docker push "${IMAGE}:${PHP}-prod-${MY_TAG}";
-          docker push "${IMAGE}:${PHP}-work-${MY_TAG}";
+          until docker push "${IMAGE}:${PHP}-base-${MY_TAG}"; do sleep 1; done;
+          until docker push "${IMAGE}:${PHP}-mods-${MY_TAG}"; do sleep 1; done;
+          until docker push "${IMAGE}:${PHP}-prod-${MY_TAG}"; do sleep 1; done;
+          until docker push "${IMAGE}:${PHP}-work-${MY_TAG}"; do sleep 1; done;
         fi
       else
         echo "Skipping push to dockerhub on normal branches";

Dockerfiles/mods/Dockerfile-5.2

@@ -352,6 +352,9 @@ ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\

Dockerfiles/mods/Dockerfile-5.3

@@ -420,6 +420,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\

Dockerfiles/mods/Dockerfile-5.4

@@ -425,6 +425,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\

Dockerfiles/mods/Dockerfile-5.5

@@ -419,6 +419,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\

Dockerfiles/mods/Dockerfile-5.6

@@ -434,6 +434,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\

Dockerfiles/mods/Dockerfile-7.0

@@ -463,6 +463,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\

Dockerfiles/mods/Dockerfile-7.1

@@ -463,6 +463,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\

Dockerfiles/mods/Dockerfile-7.2

@@ -464,6 +464,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\

Dockerfiles/mods/Dockerfile-7.3

@@ -417,7 +417,7 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/doc/wddx || true) \
 	\
 # ---- Installing PHP Extension: xdebug ----
-	&& pecl install xdebug-2.7.0beta1 \
+	&& pecl install xdebug-2.7.0RC1 \
 	&& docker-php-ext-enable xdebug \
 	&& (rm -rf /usr/local/lib/php/test/xdebug || true) \
 	&& (rm -rf /usr/local/lib/php/doc/xdebug || true) \
@@ -439,6 +439,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\

Dockerfiles/mods/Dockerfile-7.4

@@ -24,8 +24,6 @@ ENV BUILD_DEPS \
 	freetds-dev \
 	libaio-dev \
 	libbz2-dev \
-	libc-client-dev \
-	libcurl4-openssl-dev \
 	libenchant-dev \
 	libevent-dev \
 	libfbclient2 \
@@ -36,7 +34,6 @@ ENV BUILD_DEPS \
 	libib-util \
 	libicu-dev \
 	libjpeg-dev \
-	libkrb5-dev \
 	libldap2-dev \
 	libmemcached-dev \
 	libnghttp2-dev \
@@ -63,7 +60,6 @@ ENV BUILD_DEPS \
 ENV RUN_DEPS \
 	libaio1 \
 	libaspell15 \
-	libc-client2007e \
 	libenchant1c2a \
 	libfbclient2 \
 	libffi6 \
@@ -131,9 +127,7 @@ RUN set -x \
 # ---- Installing PHP Extension: ffi ----
 	&& git clone https://github.com/dstogov/php-ffi /tmp/ffi \
 	&& cd /tmp/ffi \
-	&& curl -sS -O https://github.com/fpoirotte/php-ffi/commit/734630fe3d2e3efd343d3f3636b58446abd9c941.diff \
-&& git apply 734630fe3d2e3efd343d3f3636b58446abd9c941.diff \
-&& phpize \
+	&& phpize \
 && ./configure --with-ffi \
 && make -j$(getconf _NPROCESSORS_ONLN) \
 && make install \
@@ -166,13 +160,6 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/igbinary || true) \
 	&& (rm -rf /usr/local/lib/php/doc/igbinary || true) \
 	\
-# ---- Installing PHP Extension: imap ----
-	&& ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \
-	&& /usr/local/bin/docker-php-ext-configure imap --with-kerberos --with-imap-ssl --with-imap \
-	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) imap \
-	&& (rm -rf /usr/local/lib/php/test/imap || true) \
-	&& (rm -rf /usr/local/lib/php/doc/imap || true) \
-	\
 # ---- Installing PHP Extension: interbase ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) interbase \
 	&& (rm -rf /usr/local/lib/php/test/interbase || true) \
@@ -407,6 +394,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\
@@ -480,8 +470,6 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^iconv$' \
 	&& php -m | grep -oiE '^igbinary$' \
 	&& php-fpm -m | grep -oiE '^igbinary$' \
-	&& php -m | grep -oiE '^imap$' \
-	&& php-fpm -m | grep -oiE '^imap$' \
 	&& php -m | grep -oiE '^interbase$' \
 	&& php-fpm -m | grep -oiE '^interbase$' \
 	&& php -m | grep -oiE '^intl$' \

Dockerfiles/work/Dockerfile-5.2

@@ -109,6 +109,7 @@ RUN set -x \
 		wkhtmltopdf \
 		xz-utils \
 		yarn \
+		zip \
 		zsh \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \

Dockerfiles/work/Dockerfile-5.3

@@ -109,6 +109,7 @@ RUN set -x \
 		wkhtmltopdf \
 		xz-utils \
 		yarn \
+		zip \
 		zsh \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \

Dockerfiles/work/Dockerfile-5.4

@@ -109,6 +109,7 @@ RUN set -x \
 		wkhtmltopdf \
 		xz-utils \
 		yarn \
+		zip \
 		zsh \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -154,7 +155,7 @@ RUN set -x \
 && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \
  \
 # deployer
-	&& curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS https://deployer.org/releases/v3.3.0/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 # drush7
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \
@@ -376,7 +377,7 @@ RUN set -x \
 && gulp --version | grep -E '[.0-9]+' \
  \
 	&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \
-	&& dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \
+	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
 	&& drush8 --version | grep -E '8[.0-9]+\s*$' \
 	&& git-flow version | grep -E '[.0-9]+' \

Dockerfiles/work/Dockerfile-5.5

@@ -109,6 +109,7 @@ RUN set -x \
 		wkhtmltopdf \
 		xz-utils \
 		yarn \
+		zip \
 		zsh \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -158,7 +159,7 @@ RUN set -x \
 && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \
  \
 # deployer
-	&& curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 # drush7
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \
@@ -388,7 +389,7 @@ RUN set -x \
 && gulp --version | grep -E '[.0-9]+' \
  \
 	&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \
-	&& dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \
+	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
 	&& drush8 --version | grep -E '8[.0-9]+\s*$' \
 	&& drupal --version | grep -E 'Drupal Console Launcher\s*[.0-9]' \

Dockerfiles/work/Dockerfile-5.6

@@ -109,6 +109,7 @@ RUN set -x \
 		wkhtmltopdf \
 		xz-utils \
 		yarn \
+		zip \
 		zsh \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -158,7 +159,7 @@ RUN set -x \
 && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \
  \
 # deployer
-	&& curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 # drush7
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \
@@ -401,7 +402,7 @@ RUN set -x \
 && gulp --version | grep -E '[.0-9]+' \
  \
 	&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \
-	&& dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \
+	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
 	&& drush8 --version | grep -E '8[.0-9]+\s*$' \
 	&& drush9 --version | grep -E '9[.0-9]+\s*$' \

Dockerfiles/work/Dockerfile-7.0

@@ -109,6 +109,7 @@ RUN set -x \
 		wkhtmltopdf \
 		xz-utils \
 		yarn \
+		zip \
 		zsh \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -158,7 +159,7 @@ RUN set -x \
 && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \
  \
 # deployer
-	&& curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 # drush7
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \
@@ -401,7 +402,7 @@ RUN set -x \
 && gulp --version | grep -E '[.0-9]+' \
  \
 	&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \
-	&& dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \
+	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
 	&& drush8 --version | grep -E '8[.0-9]+\s*$' \
 	&& drush9 --version | grep -E '9[.0-9]+\s*$' \

Dockerfiles/work/Dockerfile-7.1

@@ -109,6 +109,7 @@ RUN set -x \
 		wkhtmltopdf \
 		xz-utils \
 		yarn \
+		zip \
 		zsh \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -158,7 +159,7 @@ RUN set -x \
 && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \
  \
 # deployer
-	&& curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 # drush7
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \
@@ -401,7 +402,7 @@ RUN set -x \
 && gulp --version | grep -E '[.0-9]+' \
  \
 	&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \
-	&& dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \
+	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
 	&& drush8 --version | grep -E '8[.0-9]+\s*$' \
 	&& drush9 --version | grep -E '9[.0-9]+\s*$' \

Dockerfiles/work/Dockerfile-7.2

@@ -109,6 +109,7 @@ RUN set -x \
 		wkhtmltopdf \
 		xz-utils \
 		yarn \
+		zip \
 		zsh \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -158,7 +159,7 @@ RUN set -x \
 && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \
  \
 # deployer
-	&& curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 # drush7
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \
@@ -401,7 +402,7 @@ RUN set -x \
 && gulp --version | grep -E '[.0-9]+' \
  \
 	&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \
-	&& dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \
+	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
 	&& drush8 --version | grep -E '8[.0-9]+\s*$' \
 	&& drush9 --version | grep -E '9[.0-9]+\s*$' \

Dockerfiles/work/Dockerfile-7.3

@@ -109,6 +109,7 @@ RUN set -x \
 		wkhtmltopdf \
 		xz-utils \
 		yarn \
+		zip \
 		zsh \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -158,7 +159,7 @@ RUN set -x \
 && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \
  \
 # deployer
-	&& curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 # drush7
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \
@@ -390,7 +391,7 @@ RUN set -x \
 && gulp --version | grep -E '[.0-9]+' \
  \
 	&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \
-	&& dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \
+	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
 	&& drush8 --version | grep -E '8[.0-9]+\s*$' \
 	&& drush9 --version | grep -E '9[.0-9]+\s*$' \

Dockerfiles/work/Dockerfile-7.4

@@ -109,6 +109,7 @@ RUN set -x \
 		wkhtmltopdf \
 		xz-utils \
 		yarn \
+		zip \
 		zsh \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -158,7 +159,7 @@ RUN set -x \
 && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \
  \
 # deployer
-	&& curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 # drush7
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \
@@ -386,7 +387,7 @@ RUN set -x \
 && gulp --version | grep -E '[.0-9]+' \
  \
 	&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \
-	&& dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \
+	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
 	&& drush8 --version | grep -E '8[.0-9]+\s*$' \
 	&& drush9 --version | grep -E '9[.0-9]+\s*$' \

README.md

@@ -571,7 +571,7 @@ Check out this table to see which Docker image provides what PHP modules.
   <tr>
    <th>7.4</th>
    <td id="74-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="74-mods">bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, interbase, intl, json, ldap, libxml, mbstring, memcached, mongodb, mysqli, mysqlnd, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, 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, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
+   <td id="74-mods">bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, interbase, intl, json, ldap, libxml, mbstring, memcached, mongodb, mysqli, mysqlnd, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, 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, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
   </tr>
  </tbody>
 </table>

build/ansible/DOCKERFILES/Dockerfile-mods.j2

@@ -182,6 +182,11 @@ RUN set -x \
 {%		endif %}
 {%	endif %}
 {% endfor %}
+{# Fix php.ini settings for enabled extensions #}
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
+{# /Fix php.ini settings for enabled extensions #}
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\

build/ansible/DOCKERFILES/Dockerfile-work.j2

@@ -128,6 +128,7 @@ RUN set -x \
 		wkhtmltopdf \
 		xz-utils \
 		yarn \
+		zip \
 		zsh \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \

build/ansible/group_vars/all.yml

@@ -354,9 +354,18 @@ software_available:
       command: curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
   deployer:
     disabled: [5.2, 5.3]
-    check: dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+'
+    check: dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+'
+    5.4:
+      command: curl -sS https://deployer.org/releases/v3.3.0/deployer.phar -L -o /usr/local/bin/dep
+      post: chmod +x /usr/local/bin/dep
+    5.5:
+      command: curl -sS https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep
+      post: chmod +x /usr/local/bin/dep
+    5.6:
+      command: curl -sS https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep
+      post: chmod +x /usr/local/bin/dep
     all:
-      command: curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep
+      command: curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep
       post: chmod +x /usr/local/bin/dep
   drush7:
     disabled: [5.2]
@@ -903,9 +912,7 @@ extensions_available:
       type: git
       git_url: https://github.com/dstogov/php-ffi
       command: |
-        curl -sS -O https://github.com/fpoirotte/php-ffi/commit/734630fe3d2e3efd343d3f3636b58446abd9c941.diff \
-        && git apply 734630fe3d2e3efd343d3f3636b58446abd9c941.diff \
-        && phpize \
+        phpize \
         && ./configure --with-ffi \
         && make -j$(getconf _NPROCESSORS_ONLN) \
         && make install \
@@ -1017,6 +1024,8 @@ extensions_available:
       build_dep: [libmagickwand-dev]
       run_dep: [libmagickwand-6.q16-3]
   imap:
+    disabled: [7.4]   # TODO: re-enable. currently fails with: configure: error: OpenSSL libraries not found.
+
     all:
       type: builtin
       pre: ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/
@@ -1546,7 +1555,7 @@ extensions_available:
       version: 2.4.1
     7.3:
       type: pecl
-      version: 2.7.0beta1
+      version: 2.7.0RC1
     all:
       type: pecl
   xml:

tests/base/04-test-run_nginx.sh

@@ -38,7 +38,7 @@ chmod 0777 "${DOC_ROOT_HOST}"
 chmod 0644 "${DOC_ROOT_HOST}/index.php"
 
 # Pull Image
-run "while ! docker pull ${CONTAINER}; do sleep 1; done"
+run "until docker pull ${CONTAINER}; do sleep 1; done"
 
 # Start PHP-FPM
 did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT}" )"

tests/prod/05-test-env-forward_ports_to_localhost.sh

@@ -25,7 +25,7 @@ FLAVOUR="${3}"
 CONTAINER="mysql:5.6"
 
 # Pull Container
-run "while ! docker pull ${CONTAINER}; do sleep 1; done"
+run "until docker pull ${CONTAINER}; do sleep 1; done"
 
 # Start mysql container
 mdid="$( docker_run "${CONTAINER}" "-e MYSQL_ALLOW_EMPTY_PASSWORD=yes" )"

tests/prod/06-test-mount-custom_ini.sh

@@ -44,7 +44,7 @@ chmod 0777 "${DOC_ROOT_HOST}"
 chmod 0644 "${DOC_ROOT_HOST}/index.php"
 
 # Pull container
-run "while ! docker pull ${CONTAINER}; do sleep 1; done"
+run "until docker pull ${CONTAINER}; do sleep 1; done"
 
 # Start PHP-FPM
 did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT} -v ${PHP_INI_HOST}:${PHP_INI_CONT}" )"

tests/prod/07-test-mount-custom_fpm_conf.sh

@@ -49,7 +49,7 @@ chmod 0777 "${DOC_ROOT_HOST}"
 chmod 0644 "${DOC_ROOT_HOST}/index.php"
 
 # Pull container
-run "while ! docker pull ${CONTAINER}; do sleep 1; done"
+run "until docker pull ${CONTAINER}; do sleep 1; done"
 
 # Start PHP-FPM
 did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT} -v ${PHP_CNF_HOST}:${PHP_CNF_CONT}" )"

tests/work/01-test-env-mysqldump-secure.sh

@@ -27,7 +27,7 @@ MOUNTPOINT="$( mktemp --directory )"
 CONTAINER="mysql:5.6"
 
 # Pull Container
-run "while ! docker pull ${CONTAINER}; do sleep 1; done"
+run "until docker pull ${CONTAINER}; do sleep 1; done"
 
 # Start mysql container
 mdid="$( docker_run "${CONTAINER}" "-e MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" )"