Merge pull request #159 from devilbox/release-0.107

Release 0.107

.github/workflows/php-ci.yml

@@ -118,8 +118,8 @@ jobs:
       - name: Build Base
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -135,8 +135,8 @@ jobs:
       - name: Test Base
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -156,8 +156,8 @@ jobs:
       - name: Build Mods
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -173,8 +173,8 @@ jobs:
       - name: Test Mods
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -194,8 +194,8 @@ jobs:
       - name: Build Prod
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -211,8 +211,8 @@ jobs:
       - name: Test Prod
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -232,8 +232,8 @@ jobs:
       - name: Build Work
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -249,8 +249,8 @@ jobs:
       - name: Test Work
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -283,8 +283,8 @@ jobs:
       - name: Publish images (only repo owner)
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;

.github/workflows/php-nightly.yml

@@ -15,7 +15,6 @@ on:
     - cron: '0 0 * * *'
 
 
-
 # -------------------------------------------------------------------------------------------------
 # What to run
 # -------------------------------------------------------------------------------------------------
@@ -55,6 +54,12 @@ jobs:
           RUNNER_CONTEXT: ${{ toJson(runner) }}
         run: echo "${RUNNER_CONTEXT}"
 
+      - name: Show git info
+        env:
+          RUNNER_CONTEXT: ${{ toJson(runner) }}
+        run: |
+          git log | head -20
+
 
   build:
     name: "[ ${{ matrix.version }} ]"
@@ -113,8 +118,8 @@ jobs:
       - name: Build Base
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -130,8 +135,8 @@ jobs:
       - name: Test Base
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -151,8 +156,8 @@ jobs:
       - name: Build Mods
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -168,8 +173,8 @@ jobs:
       - name: Test Mods
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -189,8 +194,8 @@ jobs:
       - name: Build Prod
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -206,8 +211,8 @@ jobs:
       - name: Test Prod
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -227,8 +232,8 @@ jobs:
       - name: Build Work
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -244,8 +249,8 @@ jobs:
       - name: Test Work
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;
@@ -278,8 +283,8 @@ jobs:
       - name: Publish images (only repo owner)
         run: |
           retry() {
-            for ((n=0; n<${RETRIES}; n++)); do
-              echo "[${n}] ${*}";
+            for n in $(seq ${RETRIES}); do
+              echo "[${n}/${RETRIES}] ${*}";
               if eval "${*}"; then
                 return 0;
               fi;

.travis.yml

@@ -15,13 +15,6 @@ services:
 env:
   global:
     - IMAGE: devilbox/php-fpm
-    # travis encrypt DOCKER_USERNAME=user
-    # travis encrypt DOCKER_PASSWORD=pass
-    # Must be regenerated when repository name/owner changes
-    # DOCKER_USERNAME
-    - secure: "Y7xt3qZW9Zwrsgdd/aCf8ZqA7I039506ZDf/u/WVzGwNHta5YJJ7XYy8XG7XugyqGGXRVpfBiaqmDH4xsPLXyHXdOt2G38GXZHZXIgJOiEJ6aUfpdUxyeu8XIXkD2MDMmc3Kb27Yub/OadxRMLWEflzRnSXXs3KJ8TsbPHh0yRWDMsmHYOYl16gDGUX1izLkEx4J+9iA3+JwIFZk8by/OUuIIQ93bSNORpwHT8A1j7Y1kh8kYkPZ6nRxWO8xrc2wI1Rbp0X+ivLnOotxDZo53UI/0KroeSckDpoWfoz+B7mP+M+5B6kGlI2pKDNQB/ErYvnya6PdtFSS9skbvepR4tBhUOZDDY7NMRg9m3w0b9T1no+g3A4LBGXy6+OZZoiYAGy9LvqMhFkINqbBhRBX+mZhtG0pNXunfcu5dk81Ni/XpXDiy9JU98jItwsRj4SeaPfSt0LUNNXMS/fEwZyTy6TihN1CM3krJpV30Ic5rN64FRnrRjUuNU4lJ/W36yUhM29gb13ahh+f7sDsYoCzMwDM9HFe0YLb3ar3mW1lb3FuUugU2f2EupgCPY60X2XrY9aSgCfbdiVsA84dbLtRfHTPG7UbEcJW5RH8HS+9qVZBK+AcPqon9jbOJRVh7q99YW+R8X/XeyYpz7amacVmRus80+toZ16bbU7D2Qgjdek="
-    # DOCKER_PASSWORD
-    - secure: "ZRrVOVOkSCS2UxEi1HNF1iKefK4sDT/sPRl1HxMQjLnRRaAMdG0aRnBwQf2YAM2qzhCfN85qt6zZtC4awc2mHiZ88JrAZxBjK6xj4BwOyLbDuzpBsKXnx8Nix+wyYYKSjsC3LOYrsUe+4rvkw3tVvVaX8G2llojwdksF34VDmmHBmzCG/Bsexk7UqC+qw0PZm7BtctQO+IL0btmMDijRDElxfR+AuPvf9JdkhYzw9TOO7Jqd53NssNVGyL+XSV0dfGn8PkZTp1e8D+28pLK4oGVog+Wk7Cq94hSGjk5AkWKvL5441rupG1AA8K3njeDNMKdov4o+dmnkAH7Jh8tjShMhNhoxHce3IzpczjhoE1EyYQcyPf1qdfhV35Xv096iWX5809pp1MZF2oE5eism8JaU9NpGClryVbKVKtup8ko9/tCqz01Czq5Vue40feMkGtdePulg59OhyyPLYldsObw8QlZydkrmgVZe6b+GyybeiHraTfDq4pvTgUrC4Cmm5J3IB5Ig1THEiYKHfRJ5hSSMDDODeBXc8Xh6mFssEVshNx/jbUQWuAVYQFw/GIquVHxr6btbevrWIoD+zmqcc0L98u9pYH8w7b+gMgVJNCC4QQz2NCGGWw9l9/TmLrKJgeXbG18n8D314le1zuna6/VfH9pXIlbNO4hgz5NLHJk="
   matrix:
     - PHP=5.2
     - PHP=5.3
@@ -103,44 +96,44 @@ before_script:
 ###
 script:
   - if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
-      echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin &&
+      make login USERNAME="${DOCKER_USERNAME}" PASSWORD="${DOCKER_PASSWORD}";
       if [ "${TRAVIS_BRANCH}" == "master" ]; then
         echo "Pushing latest";
-        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;
+        make push TAG="${PHP}-base" &&
+        make push TAG="${PHP}-mods" &&
+        make push TAG="${PHP}-prod" &&
+        make push TAG="${PHP}-work";
       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}" &&
-        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;
+        make tag OLD_TAG="${PHP}-base" NEW_TAG="${PHP}-base-${TRAVIS_BRANCH}" &&
+        make tag OLD_TAG="${PHP}-mods" NEW_TAG="${PHP}-mods-${TRAVIS_BRANCH}" &&
+        make tag OLD_TAG="${PHP}-prod" NEW_TAG="${PHP}-prod-${TRAVIS_BRANCH}" &&
+        make tag OLD_TAG="${PHP}-work" NEW_TAG="${PHP}-work-${TRAVIS_BRANCH}" &&
+        make push TAG="${PHP}-base-${TRAVIS_BRANCH}" &&
+        make push TAG="${PHP}-mods-${TRAVIS_BRANCH}" &&
+        make push TAG="${PHP}-prod-${TRAVIS_BRANCH}" &&
+        make push TAG="${PHP}-work-${TRAVIS_BRANCH}";
       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}" &&
-        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;
+        make tag OLD_TAG="${PHP}-base" NEW_TAG="${PHP}-base-${TRAVIS_TAG}" &&
+        make tag OLD_TAG="${PHP}-mods" NEW_TAG="${PHP}-mods-${TRAVIS_TAG}" &&
+        make tag OLD_TAG="${PHP}-prod" NEW_TAG="${PHP}-prod-${TRAVIS_TAG}" &&
+        make tag OLD_TAG="${PHP}-work" NEW_TAG="${PHP}-work-${TRAVIS_TAG}" &&
+        make push TAG="${PHP}-base-${TRAVIS_TAG}" &&
+        make push TAG="${PHP}-mods-${TRAVIS_TAG}" &&
+        make push TAG="${PHP}-prod-${TRAVIS_TAG}" &&
+        make push TAG="${PHP}-work-${TRAVIS_TAG}";
       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}";
-          docker tag "${IMAGE}:${PHP}-base" "${IMAGE}:${PHP}-base-${MY_TAG}" &&
-          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}" &&
-          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;
+          make tag OLD_TAG="${PHP}-base" NEW_TAG="${PHP}-base-${MY_TAG}" &&
+          make tag OLD_TAG="${PHP}-mods" NEW_TAG="${PHP}-mods-${MY_TAG}" &&
+          make tag OLD_TAG="${PHP}-prod" NEW_TAG="${PHP}-prod-${MY_TAG}" &&
+          make tag OLD_TAG="${PHP}-work" NEW_TAG="${PHP}-work-${MY_TAG}" &&
+          make push TAG="${PHP}-base-${MY_TAG}" &&
+          make push TAG="${PHP}-mods-${MY_TAG}" &&
+          make push TAG="${PHP}-prod-${MY_TAG}" &&
+          make push TAG="${PHP}-work-${MY_TAG}";
         fi
       else
         echo "Skipping push to dockerhub on normal branches";

CHANGELOG.md

@@ -4,6 +4,25 @@
 ## Unreleased
 
 
+## Release 0.107
+
+#### Fixed
+- Fixes login to Dockerhub for CI jobs
+- Fixes imagick segfault by setting its threads to 1
+
+#### Added
+- Re-added imap for PHP 7.4
+- Adding `certbot` binary
+
+
+## Release 0.106
+
+#### Fixed
+- [#153](https://github.com/devilbox/docker-php-fpm/pull/153) Use numeric order for startup files
+- Fix build of PHP-FPM 7.4 snmp module
+- Disable PHP-FPM 8.0 uploadprogress module due to startup warnings
+
+
 ## Release 0.105
 
 #### Fixed

Dockerfiles/mods/Dockerfile-5.2

@@ -455,7 +455,7 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: uploadprogress --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
 	&& pecl install uploadprogress \

Dockerfiles/mods/Dockerfile-5.3

@@ -555,7 +555,7 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: uploadprogress --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
 	&& pecl install uploadprogress \

Dockerfiles/mods/Dockerfile-5.4

@@ -574,7 +574,7 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: uploadprogress --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
 	&& pecl install uploadprogress \

Dockerfiles/mods/Dockerfile-5.5

@@ -26,6 +26,7 @@ RUN set -eux \
 		libjpeg-dev \
 		libkrb5-dev \
 		libldap2-dev \
+		libmagickwand-dev \
 		libmcrypt-dev \
 		libmemcached-dev \
 		libnghttp2-dev \
@@ -41,6 +42,7 @@ RUN set -eux \
 		libssl-dev \
 		libtidy-dev \
 		libvpx-dev \
+		libwebp5 \
 		libxml2-dev \
 		libxpm-dev \
 		libxslt-dev \
@@ -194,6 +196,19 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: imagick --------------------
+RUN set -eux \
+	# Installation: Version specific
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install imagick \
+	# Enabling
+	&& docker-php-ext-enable imagick \
+	# Generic post-command
+	&& sed -i'' 's|.*"thread".*|  <policy domain="resource" name="thread" value="1"/>|g' /etc/ImageMagick-6/policy.xml \
+	&& true
+
+
 # -------------------- Installing PHP Extension: imap --------------------
 RUN set -eux \
 	# Generic pre-command
@@ -562,7 +577,7 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: uploadprogress --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
 	&& pecl install uploadprogress \
@@ -696,6 +711,7 @@ RUN set -eux \
 	libfreetype6 \
 	libicu52 \
 	libjpeg62-turbo \
+	libmagickwand-6.q16-2 \
 	libmcrypt4 \
 	libmemcachedutil2 \
 	libmysqlclient18 \
@@ -708,6 +724,7 @@ RUN set -eux \
 	libsybdb5 \
 	libtidy-0.99-0 \
 	libvpx1 \
+	libwebp5 \
 	libxpm4 \
 	libxslt1.1 \
 	libyaml-0-2 \
@@ -722,6 +739,8 @@ RUN set -eux \
 ### Post Install
 ###
 RUN set -eux \
+	# ---------- imagick ----------
+	&& sed -i'' 's|.*"thread".*|  <policy domain="resource" name="thread" value="1"/>|g' /etc/ImageMagick-6/policy.xml  \
 	# ---------- 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' )" \
@@ -790,6 +809,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^iconv$' \
 	&& php -m | grep -oiE '^igbinary$' \
 	&& php-fpm -m | grep -oiE '^igbinary$' \
+	&& php -m | grep -oiE '^imagick$' \
+	&& php-fpm -m | grep -oiE '^imagick$' \
 	&& php -m | grep -oiE '^imap$' \
 	&& php-fpm -m | grep -oiE '^imap$' \
 	&& php -m | grep -oiE '^interbase$' \

Dockerfiles/mods/Dockerfile-5.6

@@ -220,6 +220,8 @@ RUN set -eux \
 	&& pecl install imagick \
 	# Enabling
 	&& docker-php-ext-enable imagick \
+	# Generic post-command
+	&& sed -i'' 's|.*"thread".*|  <policy domain="resource" name="thread" value="1"/>|g' /etc/ImageMagick-6/policy.xml \
 	&& true
 
 
@@ -592,7 +594,7 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: uploadprogress --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
 	&& pecl install uploadprogress \
@@ -754,6 +756,8 @@ RUN set -eux \
 ### Post Install
 ###
 RUN set -eux \
+	# ---------- imagick ----------
+	&& sed -i'' 's|.*"thread".*|  <policy domain="resource" name="thread" value="1"/>|g' /etc/ImageMagick-6/policy.xml  \
 	# ---------- 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' )" \

Dockerfiles/mods/Dockerfile-7.0

@@ -222,6 +222,8 @@ RUN set -eux \
 	&& pecl install imagick \
 	# Enabling
 	&& docker-php-ext-enable imagick \
+	# Generic post-command
+	&& sed -i'' 's|.*"thread".*|  <policy domain="resource" name="thread" value="1"/>|g' /etc/ImageMagick-6/policy.xml \
 	&& true
 
 
@@ -633,7 +635,7 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: uploadprogress --------------------
 RUN set -eux \
-	# Installation: Version specific
+	# Installation: Generic
 	# Type:         GIT extension
 	&& git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \
 	&& cd /tmp/uploadprogress \
@@ -688,10 +690,10 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: yaml --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
-	&& pecl install yaml \
+	&& pecl install yaml-2.0.4 \
 	# Enabling
 	&& docker-php-ext-enable yaml \
 	&& true
@@ -801,6 +803,8 @@ RUN set -eux \
 ### Post Install
 ###
 RUN set -eux \
+	# ---------- imagick ----------
+	&& sed -i'' 's|.*"thread".*|  <policy domain="resource" name="thread" value="1"/>|g' /etc/ImageMagick-6/policy.xml  \
 	# ---------- 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' )" \

Dockerfiles/mods/Dockerfile-7.1

@@ -222,6 +222,8 @@ RUN set -eux \
 	&& pecl install imagick \
 	# Enabling
 	&& docker-php-ext-enable imagick \
+	# Generic post-command
+	&& sed -i'' 's|.*"thread".*|  <policy domain="resource" name="thread" value="1"/>|g' /etc/ImageMagick-6/policy.xml \
 	&& true
 
 
@@ -642,7 +644,7 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: uploadprogress --------------------
 RUN set -eux \
-	# Installation: Version specific
+	# Installation: Generic
 	# Type:         GIT extension
 	&& git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \
 	&& cd /tmp/uploadprogress \
@@ -811,6 +813,8 @@ RUN set -eux \
 ### Post Install
 ###
 RUN set -eux \
+	# ---------- imagick ----------
+	&& sed -i'' 's|.*"thread".*|  <policy domain="resource" name="thread" value="1"/>|g' /etc/ImageMagick-6/policy.xml  \
 	# ---------- 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' )" \

Dockerfiles/mods/Dockerfile-7.2

@@ -222,6 +222,8 @@ RUN set -eux \
 	&& pecl install imagick \
 	# Enabling
 	&& docker-php-ext-enable imagick \
+	# Generic post-command
+	&& sed -i'' 's|.*"thread".*|  <policy domain="resource" name="thread" value="1"/>|g' /etc/ImageMagick-6/policy.xml \
 	&& true
 
 
@@ -646,7 +648,7 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: uploadprogress --------------------
 RUN set -eux \
-	# Installation: Version specific
+	# Installation: Generic
 	# Type:         GIT extension
 	&& git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \
 	&& cd /tmp/uploadprogress \
@@ -815,6 +817,8 @@ RUN set -eux \
 ### Post Install
 ###
 RUN set -eux \
+	# ---------- imagick ----------
+	&& sed -i'' 's|.*"thread".*|  <policy domain="resource" name="thread" value="1"/>|g' /etc/ImageMagick-6/policy.xml  \
 	# ---------- 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' )" \

Dockerfiles/mods/Dockerfile-7.3

@@ -222,6 +222,8 @@ RUN set -eux \
 	&& pecl install imagick \
 	# Enabling
 	&& docker-php-ext-enable imagick \
+	# Generic post-command
+	&& sed -i'' 's|.*"thread".*|  <policy domain="resource" name="thread" value="1"/>|g' /etc/ImageMagick-6/policy.xml \
 	&& true
 
 
@@ -646,7 +648,7 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: uploadprogress --------------------
 RUN set -eux \
-	# Installation: Version specific
+	# Installation: Generic
 	# Type:         GIT extension
 	&& git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \
 	&& cd /tmp/uploadprogress \
@@ -815,6 +817,8 @@ RUN set -eux \
 ### Post Install
 ###
 RUN set -eux \
+	# ---------- imagick ----------
+	&& sed -i'' 's|.*"thread".*|  <policy domain="resource" name="thread" value="1"/>|g' /etc/ImageMagick-6/policy.xml  \
 	# ---------- 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' )" \

Dockerfiles/mods/Dockerfile-7.4

@@ -14,6 +14,7 @@ RUN set -eux \
 		freetds-dev \
 		libaio-dev \
 		libbz2-dev \
+		libc-client-dev \
 		libcurl4-openssl-dev \
 		libenchant-dev \
 		libevent-dev \
@@ -24,6 +25,7 @@ RUN set -eux \
 		libib-util \
 		libicu-dev \
 		libjpeg-dev \
+		libkrb5-dev \
 		libldap2-dev \
 		libmagickwand-dev \
 		libmcrypt-dev \
@@ -219,6 +221,20 @@ RUN set -eux \
 	&& pecl install imagick \
 	# Enabling
 	&& docker-php-ext-enable imagick \
+	# Generic post-command
+	&& sed -i'' 's|.*"thread".*|  <policy domain="resource" name="thread" value="1"/>|g' /etc/ImageMagick-6/policy.xml \
+	&& true
+
+
+# -------------------- Installing PHP Extension: imap --------------------
+RUN set -eux \
+	# Generic pre-command
+	&& ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \
+	# Installation: Generic
+	# Type:         Built-in extension
+	# Custom:       configure command
+	&& docker-php-ext-configure imap --with-kerberos --with-imap-ssl --with-imap \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) imap \
 	&& true
 
 
@@ -504,10 +520,9 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: snmp --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         Built-in extension
-	# Custom:       configure command
-	&& docker-php-ext-configure snmp --with-openssl-dir \
+	# Installation
 	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) snmp \
 	&& true
 
@@ -596,7 +611,7 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: uploadprogress --------------------
 RUN set -eux \
-	# Installation: Version specific
+	# Installation: Generic
 	# Type:         GIT extension
 	&& git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \
 	&& cd /tmp/uploadprogress \
@@ -720,6 +735,7 @@ RUN set -eux \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
 	libaio1 \
 	libaspell15 \
+	libc-client2007e \
 	libenchant1c2a \
 	libfbclient2 \
 	libffi6 \
@@ -755,6 +771,8 @@ RUN set -eux \
 ### Post Install
 ###
 RUN set -eux \
+	# ---------- imagick ----------
+	&& sed -i'' 's|.*"thread".*|  <policy domain="resource" name="thread" value="1"/>|g' /etc/ImageMagick-6/policy.xml  \
 	# ---------- 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' )" \
@@ -827,6 +845,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^igbinary$' \
 	&& php -m | grep -oiE '^imagick$' \
 	&& php-fpm -m | grep -oiE '^imagick$' \
+	&& php -m | grep -oiE '^imap$' \
+	&& php-fpm -m | grep -oiE '^imap$' \
 	&& php -m | grep -oiE '^intl$' \
 	&& php-fpm -m | grep -oiE '^intl$' \
 	&& php -m | grep -oiE '^json$' \

Dockerfiles/mods/Dockerfile-8.0

@@ -179,48 +179,6 @@ RUN set -eux \
 	&& true
 
 
-# -------------------- Installing PHP Extension: mongodb --------------------
-RUN set -eux \
-	# Installation: Version specific
-	# Type:         GIT extension
-	&& git clone https://github.com/mongodb/mongo-php-driver /tmp/mongodb \
-	&& cd /tmp/mongodb \
-	# Custom:       Install command
-	&& git checkout v1.6 \
-&& git submodule update --init \
-# FIXME: This is a work-around to mitigate compile error with PHP 8.0
-&& rgrep -I 'TSRMLS_C' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_C)/)/g' \
-&& rgrep -I 'TSRMLS_C' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_C,/,/g' \
-&& rgrep -I 'TSRMLS_CC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_CC)/)/g' \
-&& rgrep -I 'TSRMLS_CC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_CC,/,/g' \
-&& rgrep -I 'TSRMLS_DC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_DC)/)/g' \
-&& rgrep -I 'TSRMLS_DC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_DC,/,/g' \
-&& sed -i'' 's/TSRMLS_SET_CTX(ctx);/\/\/TSRMLS_SET_CTX(ctx);/g' php_phongo.c \
-&& sed -i'' 's/TSRMLS_FETCH();/\/\/TSRMLS_FETCH();/g' php_phongo.c \
-&& sed -i'' 's/TSRMLS_FETCH();/\/\/TSRMLS_FETCH();/g' phongo_compat.h \
-&& sed -i'' 's/TSRMLS_FETCH();/\/\/TSRMLS_FETCH();/g' src/bson.c \
-\
-&& sed -i'' 's/php_phongo_handler_binary.compare_objects.*//g' src/BSON/Binary.c \
-&& sed -i'' 's/php_phongo_handler_dbpointer.compare_objects.*//g' src/BSON/DBPointer.c \
-&& sed -i'' 's/php_phongo_handler_int64.compare_objects.*//g' src/BSON/Int64.c \
-&& sed -i'' 's/php_phongo_handler_javascript.compare_objects.*//g' src/BSON/Javascript.c \
-&& sed -i'' 's/php_phongo_handler_objectid.compare_objects.*//g' src/BSON/ObjectId.c \
-&& sed -i'' 's/php_phongo_handler_symbol.compare_objects.*//g' src/BSON/Symbol.c \
-&& sed -i'' 's/php_phongo_handler_timestamp.compare_objects.*//g' src/BSON/Timestamp.c \
-&& sed -i'' 's/php_phongo_handler_regex.compare_objects.*//g' src/BSON/Regex.c \
-&& sed -i'' 's/php_phongo_handler_server.compare_objects.*//g' src/MongoDB/Server.c \
-&& sed -i'' 's/php_phongo_handler_utcdatetime.compare_objects.*//g' src/BSON/UTCDateTime.c \
-\
-&& phpize \
-&& ./configure --enable-mongodb \
-&& make all \
-&& make install \
- \
-	# Enabling
-	&& docker-php-ext-enable mongodb \
-	&& true
-
-
 # -------------------- Installing PHP Extension: mysqli --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -451,39 +409,6 @@ RUN set -eux \
 	&& true
 
 
-# -------------------- Installing PHP Extension: uploadprogress --------------------
-RUN set -eux \
-	# Installation: Version specific
-	# Type:         GIT extension
-	&& git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \
-	&& cd /tmp/uploadprogress \
-	# Custom:       Install command
-	&& true \
-# FIXME: This is a work-around to mitigate compile error with PHP 8.0
-&& rgrep -I 'TSRMLS_CC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_CC)/)/g' || true \
-&& rgrep -I 'TSRMLS_CC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_CC,/,/g' || true \
-&& rgrep -I 'TSRMLS_DC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_DC)/)/g' || true \
-&& rgrep -I 'TSRMLS_DC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_DC,/,/g' || true \
-&& phpize \
-&& ./configure --enable-uploadprogress \
-&& make \
-&& make install \
- \
-	# Enabling
-	&& docker-php-ext-enable uploadprogress \
-	&& true
-
-
-# -------------------- Installing PHP Extension: xmlrpc --------------------
-RUN set -eux \
-	# Installation: Generic
-	# Type:         Built-in extension
-	# Custom:       configure command
-	&& docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \
-	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlrpc \
-	&& true
-
-
 # -------------------- Installing PHP Extension: xsl --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -663,8 +588,6 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^mbstring$' \
 	&& php -m | grep -oiE '^memcached$' \
 	&& php-fpm -m | grep -oiE '^memcached$' \
-	&& php -m | grep -oiE '^mongodb$' \
-	&& php-fpm -m | grep -oiE '^mongodb$' \
 	&& php -m | grep -oiE '^mysqli$' \
 	&& php-fpm -m | grep -oiE '^mysqli$' \
 	&& php -m | grep -oiE '^mysqlnd$' \
@@ -732,14 +655,10 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^tidy$' \
 	&& php -m | grep -oiE '^tokenizer$' \
 	&& php-fpm -m | grep -oiE '^tokenizer$' \
-	&& php -m | grep -oiE '^uploadprogress$' \
-	&& php-fpm -m | grep -oiE '^uploadprogress$' \
 	&& php -m | grep -oiE '^xml$' \
 	&& php-fpm -m | grep -oiE '^xml$' \
 	&& php -m | grep -oiE '^xmlreader$' \
 	&& php-fpm -m | grep -oiE '^xmlreader$' \
-	&& php -m | grep -oiE '^xmlrpc$' \
-	&& php-fpm -m | grep -oiE '^xmlrpc$' \
 	&& php -m | grep -oiE '^xmlwriter$' \
 	&& php-fpm -m | grep -oiE '^xmlwriter$' \
 	&& php -m | grep -oiE '^xsl$' \

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 -L "${script_dir}" -type f -iname '*.sh' )"
+	script_files="$( find -L "${script_dir}" -type f -iname '*.sh' | sort -n )"
 
 	# loop over them line by line
 	IFS='

Dockerfiles/work/Dockerfile-5.2

@@ -360,6 +360,9 @@ RUN set -eux \
 # -------------------- mixlib_config --------------------
 	&& gem install mixlib-config -v 2.2.4 \
 	\
+# -------------------- ffi --------------------
+	&& gem install ffi -v 1.12.2 \
+	\
 # -------------------- rb_inotify --------------------
 	&& gem install rb-inotify -v 0.9.10 \
 	\

Dockerfiles/work/Dockerfile-5.3

@@ -416,6 +416,9 @@ RUN set -eux \
 # -------------------- mixlib_config --------------------
 	&& gem install mixlib-config -v 2.2.4 \
 	\
+# -------------------- ffi --------------------
+	&& gem install ffi -v 1.12.2 \
+	\
 # -------------------- rb_inotify --------------------
 	&& gem install rb-inotify -v 0.9.10 \
 	\

Dockerfiles/work/Dockerfile-5.4

@@ -450,6 +450,9 @@ RUN set -eux \
 # -------------------- mixlib_config --------------------
 	&& gem install mixlib-config -v 2.2.4 \
 	\
+# -------------------- ffi --------------------
+	&& gem install ffi -v 1.12.2 \
+	\
 # -------------------- rb_inotify --------------------
 	&& gem install rb-inotify -v 0.9.10 \
 	\

Dockerfiles/work/Dockerfile-5.5

@@ -467,6 +467,9 @@ RUN set -eux \
 # -------------------- mixlib_config --------------------
 	&& gem install mixlib-config -v 2.2.4 \
 	\
+# -------------------- ffi --------------------
+	&& gem install ffi -v 1.12.2 \
+	\
 # -------------------- rb_inotify --------------------
 	&& gem install rb-inotify -v 0.9.10 \
 	\

Dockerfiles/work/Dockerfile-5.6

@@ -62,6 +62,7 @@ RUN set -eux \
 		blackfire-agent \
 		build-essential \
 		bzip2 \
+		certbot \
 		coreutils \
 		dnsutils \
 		dos2unix \

Dockerfiles/work/Dockerfile-7.0

@@ -62,6 +62,7 @@ RUN set -eux \
 		blackfire-agent \
 		build-essential \
 		bzip2 \
+		certbot \
 		coreutils \
 		dnsutils \
 		dos2unix \

Dockerfiles/work/Dockerfile-7.1

@@ -62,6 +62,7 @@ RUN set -eux \
 		blackfire-agent \
 		build-essential \
 		bzip2 \
+		certbot \
 		coreutils \
 		dnsutils \
 		dos2unix \

Dockerfiles/work/Dockerfile-7.2

@@ -62,6 +62,7 @@ RUN set -eux \
 		blackfire-agent \
 		build-essential \
 		bzip2 \
+		certbot \
 		coreutils \
 		dnsutils \
 		dos2unix \

Dockerfiles/work/Dockerfile-7.3

@@ -62,6 +62,7 @@ RUN set -eux \
 		blackfire-agent \
 		build-essential \
 		bzip2 \
+		certbot \
 		coreutils \
 		dnsutils \
 		dos2unix \

Dockerfiles/work/Dockerfile-7.4

@@ -62,6 +62,7 @@ RUN set -eux \
 		blackfire-agent \
 		build-essential \
 		bzip2 \
+		certbot \
 		coreutils \
 		dnsutils \
 		dos2unix \

Dockerfiles/work/Dockerfile-8.0

@@ -62,6 +62,7 @@ RUN set -eux \
 		blackfire-agent \
 		build-essential \
 		bzip2 \
+		certbot \
 		coreutils \
 		dnsutils \
 		dos2unix \

Makefile

@@ -73,12 +73,14 @@ help:
 
 gen-readme:
 ifeq ($(strip $(VERSION)),)
+	@echo "Generate README.md for all PHP versions"
 	cd build; ./gen-readme.sh
 else
+	@echo "Generate README.md for PHP $(VERSION)"
 	@$(MAKE) --no-print-directory _check-version
 	@$(MAKE) --no-print-directory _check-image-exists _EXIST_IMAGE=base
 	@$(MAKE) --no-print-directory _check-image-exists _EXIST_IMAGE=mods
-	cd build; ./gen-readme.sh ${VERSION}
+	cd build; ./gen-readme.sh $(VERSION)
 endif
 
 
@@ -227,6 +229,52 @@ test-work: _check-version
 	./tests/test.sh ${VERSION} work
 
 
+# -------------------------------------------------------------------------------------------------
+#  DOCKERHUB TARGETS
+# -------------------------------------------------------------------------------------------------
+login:
+ifeq ($(strip $(USERNAME)),)
+	@$(info This make target requires the USERNAME variable to be set.)
+	@$(info make login USERNAME= PASSWORD=)
+	@$(info )
+	@$(error Exiting)
+endif
+ifeq ($(strip $(PASSWORD)),)
+	@$(info This make target requires the PASSWORD variable to be set.)
+	@$(info make login USERNAME= PASSWORD=)
+	@$(info )
+	@$(error Exiting)
+endif
+	@yes | docker login --username $(USERNAME) --password $(PASSWORD)
+
+
+push:
+ifeq ($(strip $(TAG)),)
+	@$(info This make target requires the TAG variable to be set.)
+	@$(info make push TAG=)
+	@$(info )
+	@$(error Exiting)
+endif
+	docker push $(IMAGE):$(TAG)
+
+
+tag:
+ifeq ($(strip $(OLD_TAG)),)
+	@$(info This make target requires the OLD_TAG variable to be set.)
+	@$(info make tag OLD_TAG= NEW_TAG=)
+	@$(info )
+	@$(error Exiting)
+endif
+ifeq ($(strip $(NEW_TAG)),)
+	@$(info This make target requires the NEW_TAG variable to be set.)
+	@$(info make tag OLD_TAG= NEW_TAG=)
+	@$(info )
+	@$(error Exiting)
+endif
+	docker tag $(IMAGE):$(OLD_TAG) $(IMAGE):$(NEW_TAG)
+
+
+
 # -------------------------------------------------------------------------------------------------
 #  HELPER TARGETS
 # -------------------------------------------------------------------------------------------------
@@ -274,6 +322,7 @@ endif
 endif
 endif
 endif
+	@echo "Version $(VERSION) is valid"
 
 
 _check-image-exists:

README.md

@@ -617,7 +617,7 @@ Check out this table to see which Docker image provides what PHP modules.
   <tr>
    <th>5.5</th>
    <td id="55-base">Core, ctype, curl, date, dom, ereg, 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="55-mods">amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, mongodb, msgpack, mysql, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, psr, 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, yaml, Zend OPcache, zip, zlib</td>
+   <td id="55-mods">amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, mongodb, msgpack, mysql, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, psr, 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, yaml, Zend OPcache, zip, zlib</td>
   </tr>
   <tr>
    <th>5.6</th>
@@ -647,12 +647,12 @@ 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">amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, psr, rdkafka, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, ssh2, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib</td>
+   <td id="74-mods">amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, psr, rdkafka, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, ssh2, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib</td>
   </tr>
   <tr>
    <th>8.0</th>
    <td id="80-base">Core, ctype, curl, date, dom, FFI, 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="80-mods">bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, 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, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
+   <td id="80-mods">bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, intl, json, ldap, libxml, mbstring, memcached, mysqli, mysqlnd, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, xml, xmlreader, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
   </tr>
  </tbody>
 </table>

build/ansible/DOCKERFILES/Dockerfile-work.j2

@@ -76,6 +76,9 @@ RUN set -eux \
 		blackfire-agent \
 		build-essential \
 		bzip2 \
+{% if php_version != 5.2 and php_version != 5.3 and php_version != 5.4 and php_version != 5.5  %}
+		certbot \
+{% endif %}
 		coreutils \
 		dnsutils \
 		dos2unix \

build/ansible/group_vars/all/mods.yml

@@ -343,7 +343,11 @@ extensions_available:
     all:
       type: pecl
   imagick:
-    disabled: [5.2, 5.3, 5.4, 5.5, 8.0] # 5.3, 5.4 and 5.5 segfaults
+    disabled: [5.2, 5.3, 5.4, 8.0] # Only available since 5.3. 5.3 and 5.4 segfaults
+    5.5:
+      type: pecl
+      build_dep: [libmagickwand-dev, libwebp5]
+      run_dep: [libmagickwand-6.q16-2, libwebp5]
     5.6:
       type: pecl
       run_dep: [libmagickwand-6.q16-3, libwebp6]
@@ -354,8 +358,10 @@ extensions_available:
       type: pecl
       build_dep: [libmagickwand-dev, libwebp6]
       run_dep: [libmagickwand-6.q16-6, libwebp-dev]
+      # https://bugs.php.net/bug.php?id=77683
+      post: sed -i'' 's|.*"thread".*|  <policy domain="resource" name="thread" value="1"/>|g' /etc/ImageMagick-6/policy.xml
   imap:
-    disabled: [7.4, 8.0]   # TODO: re-enable. currently fails with: configure: error: OpenSSL libraries not found.
+    disabled: [8.0]   # 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/
@@ -500,7 +506,7 @@ extensions_available:
       command: yes yes | pecl install mongo
       build_dep: [libssl-dev, libsasl2-dev]
   mongodb:
-    disabled: [5.2]
+    disabled: [5.2, 8.0]
     5.3:
       type: pecl
       version: 0.6.3
@@ -861,6 +867,10 @@ extensions_available:
   simplexml:
     already_avail: "{{ php_all_versions }}"
   snmp:
+    7.4:
+      type: builtin
+      build_dep: [libssl-dev, libsnmp-dev, snmp]
+      run_dep: [snmp]
     all:
       type: builtin
       configure: --with-openssl-dir
@@ -973,42 +983,21 @@ extensions_available:
   tokenizer:
     already_avail: "{{ php_all_versions }}"
   uploadprogress:
-    7.0:
-      type: git
-      git_url: https://github.com/php/pecl-php-uploadprogress
-      configure: --enable-uploadprogress
-    7.1:
-      type: git
-      git_url: https://github.com/php/pecl-php-uploadprogress
-      configure: --enable-uploadprogress
-    7.2:
-      type: git
-      git_url: https://github.com/php/pecl-php-uploadprogress
-      configure: --enable-uploadprogress
-    7.3:
-      type: git
-      git_url: https://github.com/php/pecl-php-uploadprogress
-      configure: --enable-uploadprogress
-    7.4:
-      type: git
-      git_url: https://github.com/php/pecl-php-uploadprogress
-      configure: --enable-uploadprogress
-    8.0:
-      type: git
-      git_url: https://github.com/php/pecl-php-uploadprogress
-      command: |
-        true \
-        # FIXME: This is a work-around to mitigate compile error with PHP 8.0
-        && rgrep -I 'TSRMLS_CC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_CC)/)/g' || true \
-        && rgrep -I 'TSRMLS_CC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_CC,/,/g' || true \
-        && rgrep -I 'TSRMLS_DC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_DC)/)/g' || true \
-        && rgrep -I 'TSRMLS_DC' | cut -d':' -f1 | sort -u | xargs -n1 sed -i'' 's/TSRMLS_DC,/,/g' || true \
-        && phpize \
-        && ./configure --enable-uploadprogress \
-        && make \
-        && make install \
-    all:
+    disabled: [8.0]
+    5.2:
       type: pecl
+    5.3:
+      type: pecl
+    5.4:
+      type: pecl
+    5.5:
+      type: pecl
+    5.6:
+      type: pecl
+    all:
+      type: git
+      git_url: https://github.com/php/pecl-php-uploadprogress
+      configure: --enable-uploadprogress
   wddx:
     # https://wiki.php.net/rfc/deprecate-and-remove-ext-wddx
     disabled: [7.4, 8.0]
@@ -1043,6 +1032,7 @@ extensions_available:
   xmlreader:
     already_avail: "{{ php_all_versions }}"
   xmlrpc:
+    disabled: [8.0]
     7.4:
       type: builtin
       configure: --with-iconv-dir=/usr
@@ -1071,6 +1061,9 @@ extensions_available:
     5.6:
       type: pecl
       version: 1.3.2
+    7.0:
+      type: pecl
+      version: 2.0.4
     all:
       type: pecl
       build_dep: [libyaml-dev]

build/ansible/group_vars/all/work.yml

@@ -43,6 +43,7 @@ composer_enabled:
 # -------------------------------------------------------------------------------------------------
 gem_enabled:
   - mixlib_config
+  - ffi
   - rb_inotify
   - mdl
 
@@ -248,6 +249,13 @@ gem_available:
     name: mixlib-config
     all:
       version: 2.2.4
+  # Required by rb-inotify, as otherwise rb-inotify will pull ffi as a dependency in a
+  # version which is not supported by the ruby version (>= 2.3)
+  ffi:
+    name: ffi
+    disabled: [5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0]
+    all:
+      version: 1.12.2
   rb_inotify:
     name: rb-inotify
     all:

tests/mods/modules/imagick/imagick-jpeg.php

@@ -9,8 +9,8 @@ error_reporting(-1);
 
 $PHP_VERSION = str_replace('-dev', '', PHP_VERSION);
 
-// Only available since 5.3.0 (PHP 5.3, 5.4 and 5.5  segfaults)
-if (version_compare($PHP_VERSION, '5.6.0', '<')) {
+// Only available since 5.3.0 (PHP 5.3 and 5.4 segfaults)
+if (version_compare($PHP_VERSION, '5.5.0', '<')) {
 	echo 'SKIP';
 	exit(0);
 }

tests/mods/modules/imagick/imagick-png.php

@@ -9,8 +9,8 @@ error_reporting(-1);
 
 $PHP_VERSION = str_replace('-dev', '', PHP_VERSION);
 
-// Only available since 5.3.0 (PHP 5.3, 5.4 and 5.5  segfaults)
-if (version_compare($PHP_VERSION, '5.6.0', '<')) {
+// Only available since 5.3.0 (PHP 5.3 and 5.4  segfaults)
+if (version_compare($PHP_VERSION, '5.5.0', '<')) {
 	echo 'SKIP';
 	exit(0);
 }