Merge pull request #131 from devilbox/release-0.92

Release 0.92

.github/workflows/linting.yml

@@ -4,7 +4,7 @@
 ### Lints all generic and json files in the whole git repository
 ###
 
-name: linting
+name: Linting
 on:
   pull_request:
 

.github/workflows/php-ci.yml

@@ -3,7 +3,7 @@
 # -------------------------------------------------------------------------------------------------
 # Job Name
 # -------------------------------------------------------------------------------------------------
-name: PHP
+name: PHP-CI
 
 
 # -------------------------------------------------------------------------------------------------
@@ -20,10 +20,6 @@ on:
     tags:
       - '[0-9]+.[0-9]+*'
 
-  # Runs daily
-  schedule:
-    - cron: '0 0 * * *'
-
 
 # -------------------------------------------------------------------------------------------------
 # What to run
@@ -87,9 +83,35 @@ jobs:
           - '7.4'
           - '8.0'
     steps:
+
+      # ------------------------------------------------------------
+      # Checkout repository
+      # ------------------------------------------------------------
       - name: Checkout repository
         uses: actions/checkout@v1
 
+      - name: Set variables
+        id: vars
+        run: |
+          # Set git branch or git tag as slug
+          if [[ ${GITHUB_REF} =~ ^refs\/tags\/ ]]; then
+            GIT_TYPE=TAG
+            GIT_SLUG="${GITHUB_REF/refs\/tags\//}"
+          else
+            GIT_TYPE=BRANCH
+            if [ -n "${GITHUB_HEAD_REF}" ]; then
+              GIT_SLUG="${GITHUB_HEAD_REF}"
+            else
+              GIT_SLUG="${GITHUB_REF/refs\/heads\//}"
+            fi
+          fi
+
+          # Export variable
+          # # https://help.github.com/en/actions/automating-your-workflow-with-github-actions/development-tools-for-github-actions#set-an-environment-variable-set-env
+          echo ::set-env name=GIT_TYPE::${GIT_TYPE}
+          echo ::set-env name=GIT_SLUG::${GIT_SLUG}
+
+
       # ------------------------------------------------------------
       # Base
       # ------------------------------------------------------------
@@ -101,10 +123,10 @@ jobs:
               if eval "${*}"; then
                 return 0;
               fi;
+              sleep 10;
             done;
             return 1;
           }
-          sleep 10
           retry make build-base VERSION=${VERSION}
         env:
           VERSION: ${{ matrix.version }}
@@ -118,10 +140,10 @@ jobs:
               if eval "${*}"; then
                 return 0;
               fi;
+              sleep 10;
             done;
             return 1;
           }
-          sleep 10
           retry make test-base VERSION=${VERSION}
         env:
           VERSION: ${{ matrix.version }}
@@ -139,10 +161,10 @@ jobs:
               if eval "${*}"; then
                 return 0;
               fi;
+              sleep 10;
             done;
             return 1;
           }
-          sleep 10
           retry make build-mods VERSION=${VERSION}
         env:
           VERSION: ${{ matrix.version }}
@@ -156,10 +178,10 @@ jobs:
               if eval "${*}"; then
                 return 0;
               fi;
+              sleep 10;
             done;
             return 1;
           }
-          sleep 10
           retry make test-mods VERSION=${VERSION}
         env:
           VERSION: ${{ matrix.version }}
@@ -177,10 +199,10 @@ jobs:
               if eval "${*}"; then
                 return 0;
               fi;
+              sleep 10;
             done;
             return 1;
           }
-          sleep 10
           retry make build-prod VERSION=${VERSION}
         env:
           VERSION: ${{ matrix.version }}
@@ -194,10 +216,10 @@ jobs:
               if eval "${*}"; then
                 return 0;
               fi;
+              sleep 10;
             done;
             return 1;
           }
-          sleep 10
           retry make test-prod VERSION=${VERSION}
         env:
           VERSION: ${{ matrix.version }}
@@ -215,10 +237,10 @@ jobs:
               if eval "${*}"; then
                 return 0;
               fi;
+              sleep 10;
             done;
             return 1;
           }
-          sleep 10
           retry make build-work VERSION=${VERSION}
         env:
           VERSION: ${{ matrix.version }}
@@ -232,10 +254,10 @@ jobs:
               if eval "${*}"; then
                 return 0;
               fi;
+              sleep 10;
             done;
             return 1;
           }
-          sleep 10
           retry make test-work VERSION=${VERSION}
         env:
           VERSION: ${{ matrix.version }}
@@ -260,23 +282,46 @@ jobs:
       # Only run this, if the PR was created by the repo owner
       - name: Publish images (only repo owner)
         run: |
-          # Set branch or tag as slug
-          if [[ ${GITHUB_REF} =~ ^refs\/tags\/ ]]; then
-            GIT_TYPE=TAG
-            GIT_SLUG="${GITHUB_REF/refs\/tags\//}"
-          else
-            GIT_TYPE=BRANCH
-            if [ -n "${GITHUB_HEAD_REF}" ]; then
-              GIT_SLUG="${GITHUB_HEAD_REF}"
-            else
-              GIT_SLUG="${GITHUB_REF/refs\/head\//}"
-            fi
-          fi
+          retry() {
+            for ((n=0; n<${RETRIES}; n++)); do
+              echo "[${n}] ${*}";
+              if eval "${*}"; then
+                return 0;
+              fi;
+              sleep 10;
+            done;
+            return 1;
+          }
 
+          # Info output
           echo "Git Type: ${GIT_TYPE}"
           echo "Git Slug: ${GIT_SLUG}"
 
-          echo "Todo: Push to Dockerhub"
+          # Login
+          echo "retry make login USER= PASS="
+
+          # Push
+          if [ "${GIT_TYPE}" = "TAG" ]; then
+            echo "retry make push-base VERSION=${VERSION}-${GIT_SLUG}"
+            echo "retry make push-mods VERSION=${VERSION}-${GIT_SLUG}"
+            echo "retry make push-prod VERSION=${VERSION}-${GIT_SLUG}"
+            echo "retry make push-work VERSION=${VERSION}-${GIT_SLUG}"
+          else
+            if [ "${GIT_SLUG}" = "master" ]; then
+              echo "retry make push-base VERSION=${VERSION}"
+              echo "retry make push-mods VERSION=${VERSION}"
+              echo "retry make push-prod VERSION=${VERSION}"
+              echo "retry make push-work VERSION=${VERSION}"
+            else
+              echo "retry make push-base VERSION=${VERSION}-${GIT_SLUG}"
+              echo "retry make push-mods VERSION=${VERSION}-${GIT_SLUG}"
+              echo "retry make push-prod VERSION=${VERSION}-${GIT_SLUG}"
+              echo "retry make push-work VERSION=${VERSION}-${GIT_SLUG}"
+            fi
+          fi
+        env:
+          VERSION: ${{ matrix.version }}
+          RETRIES: 5
         # https://help.github.com/en/github/automating-your-workflow-with-github-actions/contexts-and-expression-syntax-for-github-actions#functions
         if: github.event.pull_request.base.repo.id == github.event.pull_request.head.repo.id
             && (

.github/workflows/php-nightly.yml

@@ -0,0 +1,328 @@
+---
+
+# -------------------------------------------------------------------------------------------------
+# Job Name
+# -------------------------------------------------------------------------------------------------
+name: PHP-Nightly
+
+
+# -------------------------------------------------------------------------------------------------
+# When to run
+# -------------------------------------------------------------------------------------------------
+on:
+  # Runs daily
+  schedule:
+    - cron: '0 0 * * *'
+
+
+
+# -------------------------------------------------------------------------------------------------
+# What to run
+# -------------------------------------------------------------------------------------------------
+jobs:
+  diagnostics:
+    name: Diagnostics
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: False
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v1
+
+      - name: Show environment
+        run: |
+          env
+
+      # https://help.github.com/en/github/automating-your-workflow-with-github-actions/contexts-and-expression-syntax-for-github-actions#github-context
+      - name: Show GitHub variables
+        run: |
+          echo "github.actor:                           ${{ github.actor }}"
+          echo "github.ref:                             ${{ github.ref }}"
+          echo "github.base_ref:                        ${{ github.base_ref }}"
+          echo "github.head_ref:                        ${{ github.head_ref }}"
+          echo "github.event:                           ${{ github.event }}"
+          echo "github.event_name:                      ${{ github.event_name }}"
+          echo "github.event.pull_request.base.repo.id: ${{ github.event.pull_request.base.repo.id }}"
+          echo "github.event.pull_request.head.repo.id: ${{ github.event.pull_request.head.repo.id }}"
+
+      - name: Dump GitHub context
+        env:
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+        run: echo "${GITHUB_CONTEXT}"
+
+      - name: Dump Runner context
+        env:
+          RUNNER_CONTEXT: ${{ toJson(runner) }}
+        run: echo "${RUNNER_CONTEXT}"
+
+
+  build:
+    name: "[ ${{ matrix.version }} ]"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: False
+      matrix:
+        # Adding all targets and only run them if they exist.
+        # Prevents us from forgetting to update this in case
+        # we add new envs in terragrunt.
+        version:
+          - '5.2'
+          - '5.3'
+          - '5.4'
+          - '5.5'
+          - '5.6'
+          - '7.0'
+          - '7.1'
+          - '7.2'
+          - '7.3'
+          - '7.4'
+          - '8.0'
+    steps:
+
+      # ------------------------------------------------------------
+      # Checkout repository
+      # ------------------------------------------------------------
+      - name: Checkout repository
+        uses: actions/checkout@v1
+
+      - name: Set variables
+        id: vars
+        run: |
+          # Set git branch or git tag as slug
+          if [[ ${GITHUB_REF} =~ ^refs\/tags\/ ]]; then
+            GIT_TYPE=TAG
+            GIT_SLUG="${GITHUB_REF/refs\/tags\//}"
+          else
+            GIT_TYPE=BRANCH
+            if [ -n "${GITHUB_HEAD_REF}" ]; then
+              GIT_SLUG="${GITHUB_HEAD_REF}"
+            else
+              GIT_SLUG="${GITHUB_REF/refs\/heads\//}"
+            fi
+          fi
+
+          # Export variable
+          # # https://help.github.com/en/actions/automating-your-workflow-with-github-actions/development-tools-for-github-actions#set-an-environment-variable-set-env
+          echo ::set-env name=GIT_TYPE::${GIT_TYPE}
+          echo ::set-env name=GIT_SLUG::${GIT_SLUG}
+
+
+      # ------------------------------------------------------------
+      # Base
+      # ------------------------------------------------------------
+      - name: Build Base
+        run: |
+          retry() {
+            for ((n=0; n<${RETRIES}; n++)); do
+              echo "[${n}] ${*}";
+              if eval "${*}"; then
+                return 0;
+              fi;
+              sleep 10;
+            done;
+            return 1;
+          }
+          retry make build-base VERSION=${VERSION}
+        env:
+          VERSION: ${{ matrix.version }}
+          RETRIES: 5
+
+      - name: Test Base
+        run: |
+          retry() {
+            for ((n=0; n<${RETRIES}; n++)); do
+              echo "[${n}] ${*}";
+              if eval "${*}"; then
+                return 0;
+              fi;
+              sleep 10;
+            done;
+            return 1;
+          }
+          retry make test-base VERSION=${VERSION}
+        env:
+          VERSION: ${{ matrix.version }}
+          RETRIES: 5
+
+
+      # ------------------------------------------------------------
+      # Mods
+      # ------------------------------------------------------------
+      - name: Build Mods
+        run: |
+          retry() {
+            for ((n=0; n<${RETRIES}; n++)); do
+              echo "[${n}] ${*}";
+              if eval "${*}"; then
+                return 0;
+              fi;
+              sleep 10;
+            done;
+            return 1;
+          }
+          retry make build-mods VERSION=${VERSION}
+        env:
+          VERSION: ${{ matrix.version }}
+          RETRIES: 5
+
+      - name: Test Mods
+        run: |
+          retry() {
+            for ((n=0; n<${RETRIES}; n++)); do
+              echo "[${n}] ${*}";
+              if eval "${*}"; then
+                return 0;
+              fi;
+              sleep 10;
+            done;
+            return 1;
+          }
+          retry make test-mods VERSION=${VERSION}
+        env:
+          VERSION: ${{ matrix.version }}
+          RETRIES: 5
+
+
+      # ------------------------------------------------------------
+      # Prod
+      # ------------------------------------------------------------
+      - name: Build Prod
+        run: |
+          retry() {
+            for ((n=0; n<${RETRIES}; n++)); do
+              echo "[${n}] ${*}";
+              if eval "${*}"; then
+                return 0;
+              fi;
+              sleep 10;
+            done;
+            return 1;
+          }
+          retry make build-prod VERSION=${VERSION}
+        env:
+          VERSION: ${{ matrix.version }}
+          RETRIES: 5
+
+      - name: Test Prod
+        run: |
+          retry() {
+            for ((n=0; n<${RETRIES}; n++)); do
+              echo "[${n}] ${*}";
+              if eval "${*}"; then
+                return 0;
+              fi;
+              sleep 10;
+            done;
+            return 1;
+          }
+          retry make test-prod VERSION=${VERSION}
+        env:
+          VERSION: ${{ matrix.version }}
+          RETRIES: 5
+
+
+      # ------------------------------------------------------------
+      # Work
+      # ------------------------------------------------------------
+      - name: Build Work
+        run: |
+          retry() {
+            for ((n=0; n<${RETRIES}; n++)); do
+              echo "[${n}] ${*}";
+              if eval "${*}"; then
+                return 0;
+              fi;
+              sleep 10;
+            done;
+            return 1;
+          }
+          retry make build-work VERSION=${VERSION}
+        env:
+          VERSION: ${{ matrix.version }}
+          RETRIES: 5
+
+      - name: Test Work
+        run: |
+          retry() {
+            for ((n=0; n<${RETRIES}; n++)); do
+              echo "[${n}] ${*}";
+              if eval "${*}"; then
+                return 0;
+              fi;
+              sleep 10;
+            done;
+            return 1;
+          }
+          retry make test-work VERSION=${VERSION}
+        env:
+          VERSION: ${{ matrix.version }}
+          RETRIES: 5
+
+
+      # ------------------------------------------------------------
+      # Diff README.md
+      # ------------------------------------------------------------
+      - name: Diff README.md
+        run: |
+          make gen-readme VERSION=${VERSION}
+          git diff --quiet || { echo "Build Changes"; git diff; git status; false; }
+        env:
+          VERSION: ${{ matrix.version }}
+
+
+      # ------------------------------------------------------------
+      # Push build artifacts
+      # ------------------------------------------------------------
+
+      # Only run this, if the PR was created by the repo owner
+      - name: Publish images (only repo owner)
+        run: |
+          retry() {
+            for ((n=0; n<${RETRIES}; n++)); do
+              echo "[${n}] ${*}";
+              if eval "${*}"; then
+                return 0;
+              fi;
+              sleep 10;
+            done;
+            return 1;
+          }
+
+          # Info output
+          echo "Git Type: ${GIT_TYPE}"
+          echo "Git Slug: ${GIT_SLUG}"
+
+          # Login
+          echo "retry make login USER= PASS="
+
+          # Push
+          if [ "${GIT_TYPE}" = "TAG" ]; then
+            echo "retry make push-base VERSION=${VERSION}-${GIT_SLUG}"
+            echo "retry make push-mods VERSION=${VERSION}-${GIT_SLUG}"
+            echo "retry make push-prod VERSION=${VERSION}-${GIT_SLUG}"
+            echo "retry make push-work VERSION=${VERSION}-${GIT_SLUG}"
+          else
+            if [ "${GIT_SLUG}" = "master" ]; then
+              echo "retry make push-base VERSION=${VERSION}"
+              echo "retry make push-mods VERSION=${VERSION}"
+              echo "retry make push-prod VERSION=${VERSION}"
+              echo "retry make push-work VERSION=${VERSION}"
+            else
+              echo "retry make push-base VERSION=${VERSION}-${GIT_SLUG}"
+              echo "retry make push-mods VERSION=${VERSION}-${GIT_SLUG}"
+              echo "retry make push-prod VERSION=${VERSION}-${GIT_SLUG}"
+              echo "retry make push-work VERSION=${VERSION}-${GIT_SLUG}"
+            fi
+          fi
+        env:
+          VERSION: ${{ matrix.version }}
+          RETRIES: 5
+        # https://help.github.com/en/github/automating-your-workflow-with-github-actions/contexts-and-expression-syntax-for-github-actions#functions
+        if: github.event.pull_request.base.repo.id == github.event.pull_request.head.repo.id
+            && (
+              (github.event_name == 'schedule'     && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')))
+              ||
+              (github.event_name == 'push'         && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')))
+              ||
+              (github.event_name == 'pull_request' && (startsWith(github.head_ref, 'release-')))
+            )

Dockerfiles/base/Dockerfile-5.2

@@ -107,4 +107,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/local/sbin/php-fpm"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/base/Dockerfile-5.3

@@ -107,4 +107,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/local/sbin/php-fpm"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/base/Dockerfile-5.4

@@ -107,4 +107,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/local/sbin/php-fpm"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/base/Dockerfile-5.5

@@ -107,4 +107,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/local/sbin/php-fpm"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/base/Dockerfile-5.6

@@ -100,4 +100,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/local/sbin/php-fpm"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/base/Dockerfile-7.0

@@ -100,4 +100,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/local/sbin/php-fpm"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/base/Dockerfile-7.1

@@ -100,4 +100,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/local/sbin/php-fpm"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/base/Dockerfile-7.2

@@ -100,4 +100,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/local/sbin/php-fpm"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/base/Dockerfile-7.3

@@ -100,4 +100,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/local/sbin/php-fpm"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/base/Dockerfile-7.4

@@ -100,4 +100,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/local/sbin/php-fpm"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/base/Dockerfile-8.0

@@ -100,4 +100,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/local/sbin/php-fpm"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/base/data/docker-entrypoint.sh

@@ -2,7 +2,7 @@
 
 set -e
 set -u
-set -p pipefail
+set -o pipefail
 
 
 ###
@@ -52,4 +52,4 @@ set_gid "NEW_GID" "${MY_GROUP}" "/home/${MY_USER}" "${DEBUG_LEVEL}"
 ### Startup
 ###
 log "info" "Starting $( php-fpm -v 2>&1 | head -1 )" "${DEBUG_LEVEL}"
-exec /usr/local/sbin/php-fpm
+exec "${@}"

Dockerfiles/mods/Dockerfile-5.2

@@ -773,4 +773,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/local/sbin/php-fpm"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/mods/Dockerfile-5.3

@@ -448,7 +448,7 @@ RUN set -eux \
 	# Custom:       Branch
 	&& git checkout phalcon-v2.0.9 \
 	# Custom:       Install command
-	&& cd build && ./install >/dev/null \
+	&& cd build && ./install \
 	# Enabling
 	&& docker-php-ext-enable phalcon \
 	&& true
@@ -916,4 +916,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/local/sbin/php-fpm"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/mods/Dockerfile-5.4

@@ -924,4 +924,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/local/sbin/php-fpm"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/mods/Dockerfile-5.5

@@ -912,4 +912,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/local/sbin/php-fpm"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/mods/Dockerfile-5.6

@@ -930,4 +930,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/local/sbin/php-fpm"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/mods/Dockerfile-7.0

@@ -973,4 +973,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/local/sbin/php-fpm"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/mods/Dockerfile-7.1

@@ -971,4 +971,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/local/sbin/php-fpm"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/mods/Dockerfile-7.2

@@ -977,4 +977,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/local/sbin/php-fpm"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/mods/Dockerfile-7.3

@@ -36,6 +36,7 @@ RUN set -eux \
 		libpng-dev \
 		libpq-dev \
 		libpspell-dev \
+		librabbitmq-dev \
 		librdkafka-dev \
 		librecode-dev \
 		libsasl2-dev \
@@ -69,6 +70,17 @@ RUN set -eux \
 			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
 		fi
 
+# -------------------- Installing PHP Extension: amqp --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Custom:       Pecl command
+	&& echo "/usr" | pecl install amqp \
+	# Enabling
+	&& docker-php-ext-enable amqp \
+	&& true
+
+
 # -------------------- Installing PHP Extension: apcu --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -427,6 +439,21 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: phalcon --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         GIT extension
+	&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
+	&& cd /tmp/phalcon \
+	# Custom:       Branch
+	&& 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) \
+	# Custom:       Install command
+	&& cd build && ./install \
+	# Enabling
+	&& docker-php-ext-enable phalcon \
+	&& true
+
+
 # -------------------- Installing PHP Extension: pspell --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -704,6 +731,7 @@ RUN set -eux \
 	libnghttp2-14 \
 	libpng16-16 \
 	libpq5 \
+	librabbitmq4 \
 	librdkafka1 \
 	librecode0 \
 	libsybdb5 \
@@ -753,6 +781,8 @@ RUN set -eux \
 	&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
 	&& rm -f /usr/local/etc/php/php.ini \
 	\
+	&& php -m | grep -oiE '^amqp$' \
+	&& php-fpm -m | grep -oiE '^amqp$' \
 	&& php -m | grep -oiE '^apcu$' \
 	&& php-fpm -m | grep -oiE '^apcu$' \
 	&& php -m | grep -oiE '^bcmath$' \
@@ -849,6 +879,8 @@ RUN set -eux \
 	&& 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$' \
@@ -924,4 +956,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/local/sbin/php-fpm"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/mods/Dockerfile-7.4

@@ -25,11 +25,14 @@ RUN set -eux \
 		libicu-dev \
 		libjpeg-dev \
 		libldap2-dev \
+		libmagickwand-dev \
+		libmcrypt-dev \
 		libmemcached-dev \
 		libnghttp2-dev \
 		libpng-dev \
 		libpq-dev \
 		libpspell-dev \
+		librabbitmq-dev \
 		librdkafka-dev \
 		libsasl2-dev \
 		libsnmp-dev \
@@ -61,6 +64,17 @@ RUN set -eux \
 			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
 		fi
 
+# -------------------- Installing PHP Extension: amqp --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Custom:       Pecl command
+	&& echo "/usr" | pecl install amqp \
+	# Enabling
+	&& docker-php-ext-enable amqp \
+	&& true
+
+
 # -------------------- Installing PHP Extension: bcmath --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -160,6 +174,17 @@ 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 \
+	&& true
+
+
 # -------------------- Installing PHP Extension: intl --------------------
 RUN set -eux \
 	# Installation: Version specific
@@ -181,6 +206,28 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: mcrypt --------------------
+RUN set -eux \
+	# Installation: Version specific
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install mcrypt \
+	# Enabling
+	&& docker-php-ext-enable mcrypt \
+	&& true
+
+
+# -------------------- Installing PHP Extension: msgpack --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install msgpack \
+	# Enabling
+	&& docker-php-ext-enable msgpack \
+	&& true
+
+
 # -------------------- Installing PHP Extension: memcached --------------------
 RUN set -eux \
 	# Installation: Version specific
@@ -481,6 +528,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: xdebug --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install xdebug \
+	# Enabling
+	&& docker-php-ext-enable xdebug \
+	&& true
+
+
 # -------------------- Installing PHP Extension: xmlrpc --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -573,10 +631,13 @@ RUN set -eux \
 	libhiredis0.13 \
 	libicu57 \
 	libjpeg62-turbo \
+	libmagickwand-6.q16-3 \
+	libmcrypt4 \
 	libmemcachedutil2 \
 	libnghttp2-14 \
 	libpng16-16 \
 	libpq5 \
+	librabbitmq4 \
 	librdkafka1 \
 	libsybdb5 \
 	libtidy5 \
@@ -624,6 +685,8 @@ RUN set -eux \
 	&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
 	&& rm -f /usr/local/etc/php/php.ini \
 	\
+	&& php -m | grep -oiE '^amqp$' \
+	&& php-fpm -m | grep -oiE '^amqp$' \
 	&& php -m | grep -oiE '^bcmath$' \
 	&& php-fpm -m | grep -oiE '^bcmath$' \
 	&& php -m | grep -oiE '^bz2$' \
@@ -660,6 +723,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 '^intl$' \
 	&& php-fpm -m | grep -oiE '^intl$' \
 	&& php -m | grep -oiE '^json$' \
@@ -670,6 +735,10 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^libxml$' \
 	&& php -m | grep -oiE '^mbstring$' \
 	&& php-fpm -m | grep -oiE '^mbstring$' \
+	&& php -m | grep -oiE '^mcrypt$' \
+	&& php-fpm -m | grep -oiE '^mcrypt$' \
+	&& php -m | grep -oiE '^msgpack$' \
+	&& php-fpm -m | grep -oiE '^msgpack$' \
 	&& php -m | grep -oiE '^memcached$' \
 	&& php-fpm -m | grep -oiE '^memcached$' \
 	&& php -m | grep -oiE '^mongodb$' \
@@ -747,6 +816,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^tokenizer$' \
 	&& php -m | grep -oiE '^uploadprogress$' \
 	&& php-fpm -m | grep -oiE '^uploadprogress$' \
+	&& php -m | grep -oiE '^xdebug$' \
+	&& php-fpm -m | grep -oiE '^xdebug$' \
 	&& php -m | grep -oiE '^xml$' \
 	&& php-fpm -m | grep -oiE '^xml$' \
 	&& php -m | grep -oiE '^xmlreader$' \
@@ -771,4 +842,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/local/sbin/php-fpm"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/mods/Dockerfile-8.0

@@ -755,4 +755,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/local/sbin/php-fpm"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/prod/Dockerfile-5.2

@@ -93,4 +93,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/prod/Dockerfile-5.3

@@ -93,4 +93,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/prod/Dockerfile-5.4

@@ -93,4 +93,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/prod/Dockerfile-5.5

@@ -93,4 +93,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/prod/Dockerfile-5.6

@@ -93,4 +93,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/prod/Dockerfile-7.0

@@ -93,4 +93,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/prod/Dockerfile-7.1

@@ -93,4 +93,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/prod/Dockerfile-7.2

@@ -93,4 +93,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/prod/Dockerfile-7.3

@@ -93,4 +93,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/prod/Dockerfile-7.4

@@ -93,4 +93,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/prod/Dockerfile-8.0

@@ -93,4 +93,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/prod/data/docker-entrypoint.sh

@@ -2,7 +2,7 @@
 
 set -e
 set -u
-set -p pipefail
+set -o pipefail
 
 
 ###
@@ -190,4 +190,4 @@ execute_custom_scripts "/startup.2.d" "${DEBUG_LEVEL}"
 ### Startup
 ###
 log "info" "Starting supervisord" "${DEBUG_LEVEL}"
-exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
+exec "${@}"

Dockerfiles/work/Dockerfile-5.2

@@ -516,4 +516,5 @@ WORKDIR /shared/httpd
 ###
 ### Entrypoint
 ###
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/work/Dockerfile-5.3

@@ -573,4 +573,5 @@ WORKDIR /shared/httpd
 ###
 ### Entrypoint
 ###
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/work/Dockerfile-5.4

@@ -610,4 +610,5 @@ WORKDIR /shared/httpd
 ###
 ### Entrypoint
 ###
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/work/Dockerfile-5.5

@@ -631,4 +631,5 @@ WORKDIR /shared/httpd
 ###
 ### Entrypoint
 ###
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/work/Dockerfile-5.6

@@ -645,4 +645,5 @@ WORKDIR /shared/httpd
 ###
 ### Entrypoint
 ###
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/work/Dockerfile-7.0

@@ -645,4 +645,5 @@ WORKDIR /shared/httpd
 ###
 ### Entrypoint
 ###
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/work/Dockerfile-7.1

@@ -645,4 +645,5 @@ WORKDIR /shared/httpd
 ###
 ### Entrypoint
 ###
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/work/Dockerfile-7.2

@@ -645,4 +645,5 @@ WORKDIR /shared/httpd
 ###
 ### Entrypoint
 ###
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/work/Dockerfile-7.3

@@ -631,4 +631,5 @@ WORKDIR /shared/httpd
 ###
 ### Entrypoint
 ###
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/work/Dockerfile-7.4

@@ -625,4 +625,5 @@ WORKDIR /shared/httpd
 ###
 ### Entrypoint
 ###
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/work/Dockerfile-8.0

@@ -534,4 +534,5 @@ WORKDIR /shared/httpd
 ###
 ### Entrypoint
 ###
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/work/data/docker-entrypoint.sh

@@ -2,7 +2,7 @@
 
 set -e
 set -u
-set -p pipefail
+set -o pipefail
 
 
 ###
@@ -217,4 +217,4 @@ execute_custom_scripts "/startup.2.d" "${DEBUG_LEVEL}"
 ### Startup
 ###
 log "info" "Starting supervisord" "${DEBUG_LEVEL}"
-exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
+exec "${@}"

README.md

@@ -1,8 +1,9 @@
 # PHP-FPM Docker images
 
-[![PHP](https://github.com/devilbox/docker-php-fpm/workflows/linting/badge.svg)](https://github.com/devilbox/docker-php-fpm/actions?workflow=linting)
-[![Linting](https://github.com/devilbox/docker-php-fpm/workflows/PHP/badge.svg)](https://github.com/devilbox/docker-php-fpm/actions?workflow=PHP)
-[![Build Status](https://travis-ci.org/devilbox/docker-php-fpm.svg?branch=master)](https://travis-ci.org/devilbox/docker-php-fpm)
+[![Linting](https://github.com/devilbox/docker-php-fpm/workflows/Linting/badge.svg)](https://github.com/devilbox/docker-php-fpm/actions?workflow=Linting)
+[![CI](https://github.com/devilbox/docker-php-fpm/workflows/PHP-CI/badge.svg)](https://github.com/devilbox/docker-php-fpm/actions?workflow=PHP-CI)
+[![Nightly](https://github.com/devilbox/docker-php-fpm/workflows/PHP-Nightly/badge.svg)](https://github.com/devilbox/docker-php-fpm/actions?workflow=PHP-Nightly)
+[![Travis](https://travis-ci.org/devilbox/docker-php-fpm.svg?branch=master)](https://travis-ci.org/devilbox/docker-php-fpm)
 [![Release](https://img.shields.io/github/release/devilbox/docker-php-fpm.svg?colorB=orange)](https://github.com/devilbox/docker-php-fpm/releases)
 [![Gitter](https://badges.gitter.im/devilbox/Lobby.svg)](https://gitter.im/devilbox/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Discourse](https://img.shields.io/discourse/https/devilbox.discourse.group/status.svg?colorB=%234CB697)](https://devilbox.discourse.group)
@@ -641,12 +642,12 @@ Check out this table to see which Docker image provides what PHP modules.
   <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, blackfire, 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, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, 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">amqp, apcu, bcmath, blackfire, 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, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, 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>
    <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, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, 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, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
+   <td id="74-mods">amqp, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, intl, json, ldap, libxml, mbstring, mcrypt, memcached, mongodb, msgpack, 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, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
   </tr>
   <tr>
    <th>8.0</th>
@@ -1237,9 +1238,8 @@ $ docker exec -it php mysqldump-secure
 
 <h2><img id="automated-builds" width="20" src="https://github.com/devilbox/artwork/raw/master/submissions_logo/cytopia/01/png/logo_64_trans.png"> Automated builds</h2>
 
-[![PHP](https://github.com/devilbox/docker-php-fpm/workflows/linting/badge.svg)](https://github.com/devilbox/docker-php-fpm/actions?workflow=linting)
-[![Linting](https://github.com/devilbox/docker-php-fpm/workflows/PHP/badge.svg)](https://github.com/devilbox/docker-php-fpm/actions?workflow=PHP)
-[![Build Status](https://travis-ci.org/devilbox/docker-php-fpm.svg?branch=master)](https://travis-ci.org/devilbox/docker-php-fpm)
+[![Nightly](https://github.com/devilbox/docker-php-fpm/workflows/PHP-Nightly/badge.svg)](https://github.com/devilbox/docker-php-fpm/actions?workflow=PHP-Nightly)
+[![Travis](https://travis-ci.org/devilbox/docker-php-fpm.svg?branch=master)](https://travis-ci.org/devilbox/docker-php-fpm)
 
 Docker images are built and tested every night by **[travis-ci](https://travis-ci.org/devilbox/docker-php-fpm)** and pushed to **[Docker hub](https://hub.docker.com/r/devilbox/php-fpm/)** on success. This is all done automatically to ensure that sources as well as base images are always fresh and in case of security updates always have the latest patches.
 

build/ansible/DOCKERFILES/Dockerfile-base.j2

@@ -121,4 +121,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/local/sbin/php-fpm"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

build/ansible/DOCKERFILES/Dockerfile-mods.j2

@@ -439,4 +439,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/local/sbin/php-fpm"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

build/ansible/DOCKERFILES/Dockerfile-prod.j2

@@ -95,4 +95,5 @@ EXPOSE 9000
 ###
 ### Entrypoint
 ###
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

build/ansible/DOCKERFILES/Dockerfile-work.j2

@@ -547,4 +547,5 @@ WORKDIR /shared/httpd
 ###
 ### Entrypoint
 ###
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
 ENTRYPOINT ["/docker-entrypoint.sh"]

build/ansible/group_vars/all/mods.yml

@@ -137,7 +137,7 @@ extensions_enabled:
 #   command:     [required] Custom command to install and enable a module
 extensions_available:
   amqp:
-    disabled: [7.3, 7.4, 8.0]
+    disabled: [8.0]
     5.2:
       run_dep: [librabbitmq1]
       type: pecl
@@ -340,7 +340,7 @@ extensions_available:
     all:
       type: pecl
   imagick:
-    disabled: [5.2, 7.4, 8.0]
+    disabled: [5.2, 8.0]
     5.3:
       type: pecl
       version: 3.3.0
@@ -357,6 +357,9 @@ extensions_available:
     7.0:
       type: pecl
       run_dep: [libmagickwand-6.q16-3]
+    7.4:
+      type: pecl
+      run_dep: [libmagickwand-6.q16-3]
     all:
       type: pecl
       build_dep: [libmagickwand-dev]
@@ -433,13 +436,15 @@ extensions_available:
     all:
       type: builtin
   mcrypt:
-    disabled: [7.4, 8.0]
+    disabled: [8.0]
     7.2:
       type: pecl
       version: 1.0.1
     7.3:
       type: pecl
       version: 1.0.2
+    7.4:
+      type: pecl
     all:
       type: builtin
       run_dep: [libmcrypt4]
@@ -558,7 +563,7 @@ extensions_available:
       type: pecl
       build_dep: [libssl-dev, libsasl2-dev]
   msgpack:
-    disabled: [7.4, 8.0]
+    disabled: [8.0]
     5.2:
       type: pecl
       version: 0.5.7
@@ -737,12 +742,12 @@ extensions_available:
       build_dep: [libpq-dev]
       run_dep: [libpq5]
   phalcon:
-    disabled: [5.2, 7.3, 7.4, 8.0] # TODO: currently disabled for 7.3 as it breaks
+    disabled: [5.2, 7.4, 8.0] # TODO: currently disabled for 7.4 as it breaks
     5.3:
       type: git
       git_url: https://github.com/phalcon/cphalcon
       git_ref: phalcon-v2.0.9
-      command: cd build && ./install >/dev/null
+      command: cd build && ./install
     5.4:
       type: git
       git_url: https://github.com/phalcon/cphalcon
@@ -1051,7 +1056,7 @@ extensions_available:
       configure: --with-libxml-dir=/usr
       build_dep: [libxml2-dev]
   xdebug:
-    disabled: [7.4, 8.0]
+    disabled: [8.0]
     5.2:
       type: pecl
       version: 2.2.7