Merge pull request #249 from devilbox/release-0.142

Release 0.142
devilbox · Nov 21, 2022 · 70e3fc6 · 70e3fc6
2 parents 8a7ca18 + e6564db
commit 70e3fc6
Show file tree

Hide file tree

Showing 25 changed files with 170 additions and 116 deletions.
diff --git a/.github/workflows/action-schedule_master.yml b/.github/workflows/action-schedule_master.yml
@@ -35,7 +35,6 @@ jobs:
     with:
       enabled: true
       can_deploy: true
-      is_scheduled: true
       versions: ${{ needs.params.outputs.versions }}
       refs: ${{ needs.params.outputs.refs }}
     secrets:
@@ -54,6 +53,7 @@ jobs:
       has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
       run_tests: false
       upload_artifact: true
+      pull_base_image: true
       matrix: ${{ needs.configure.outputs.matrix_build }}
       artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
       stage: base

diff --git a/.github/workflows/action-schedule_tags.yml b/.github/workflows/action-schedule_tags.yml
@@ -35,7 +35,6 @@ jobs:
     with:
       enabled: true
       can_deploy: true
-      is_scheduled: true
       versions: ${{ needs.params.outputs.versions }}
       refs: ${{ needs.params.outputs.refs }}
     secrets:
@@ -54,6 +53,7 @@ jobs:
       has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
       run_tests: false
       upload_artifact: true
+      pull_base_image: true
       matrix: ${{ needs.configure.outputs.matrix_build }}
       artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
       stage: base

diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
@@ -35,7 +35,6 @@ jobs:
     with:
       enabled: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && (github.event.pull_request.user.login != 'cytopia')) }}
       can_deploy: ${{ (github.repository == 'devilbox/docker-php-fpm') && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/release-')) }}
-      is_scheduled: false
       versions: ${{ needs.params.outputs.versions }}
       refs: ${{ needs.params.outputs.refs }}
     secrets:
@@ -54,6 +53,7 @@ jobs:
       has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
       run_tests: false
       upload_artifact: true
+      pull_base_image: true
       matrix: ${{ needs.configure.outputs.matrix_build }}
       artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
       stage: base

diff --git a/.github/workflows/params-nightly_master.yml b/.github/workflows/params-nightly_master.yml
@@ -61,9 +61,11 @@ jobs:
       - name: "[Set-Output] jsonify VERSIONS"
         id: set-versions
         run: |
-          echo "::set-output name=versions::$( echo '${{ env.VERSIONS }}' | jq -M -c )"
+          VERSIONS="$( echo '${{ env.VERSIONS }}' | jq -M -c )"
+          echo "versions=${VERSIONS}" >> $GITHUB_OUTPUT
 
       - name: "[Set-Output] jsonify REFS"
         id: set-refs
         run: |
-          echo "::set-output name=refs::$( echo '${{ env.REFS }}' | jq -M -c )"
+          REFS="$( echo '${{ env.REFS }}' | jq -M -c )"
+          echo "refs=${REFS}" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/params-nightly_tags.yml b/.github/workflows/params-nightly_tags.yml
@@ -61,9 +61,11 @@ jobs:
       - name: "[Set-Output] jsonify VERSIONS"
         id: set-versions
         run: |
-          echo "::set-output name=versions::$( echo '${{ env.VERSIONS }}' | jq -M -c )"
+          VERSIONS="$( echo '${{ env.VERSIONS }}' | jq -M -c )"
+          echo "versions=${VERSIONS}" >> $GITHUB_OUTPUT
 
       - name: "[Set-Output] jsonify REFS"
         id: set-refs
         run: |
-          echo "::set-output name=refs::$( echo '${{ env.REFS }}' | jq -M -c )"
+          REFS="$( echo '${{ env.REFS }}' | jq -M -c )"
+          echo "refs=${REFS}" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/params.yml b/.github/workflows/params.yml
@@ -61,9 +61,11 @@ jobs:
       - name: "[Set-Output] jsonify VERSIONS"
         id: set-versions
         run: |
-          echo "::set-output name=versions::$( echo '${{ env.VERSIONS }}' | jq -M -c )"
+          VERSIONS="$( echo '${{ env.VERSIONS }}' | jq -M -c )"
+          echo "versions=${VERSIONS}" >> $GITHUB_OUTPUT
 
       - name: "[Set-Output] jsonify REFS"
         id: set-refs
         run: |
-          echo "::set-output name=refs::$( echo '${{ env.REFS }}' | jq -M -c )"
+          REFS="$( echo '${{ env.REFS }}' | jq -M -c )"
+          echo "refs=${REFS}" >> $GITHUB_OUTPUT
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,20 @@
 ## Unreleased
 
 
+## Release 0.142
+
+### Fixed
+- Fixed `phalcon` module
+- Fixed `swoole` module
+- Fixed installation of wkhtmltopdf [#245](https://github.com/devilbox/docker-php-fpm/pull/245)
+- FIxed installation of drupalconsole [#246](https://github.com/devilbox/docker-php-fpm/pull/246)
+- Fixed installation of symfoni cli [#247](https://github.com/devilbox/docker-php-fpm/pull/247)
+- Fixed installation of NodeJS
+- Fixed installation of PostgreSQL client for PHP 5.6
+- Fixed installation of PostgreSQL client for PHP 7.0
+- Disabled Phalcon Devtools for PHP 7.4 as it breaks
+
+
 ## Release 0.141
 
 ### Fixed

diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2
@@ -534,12 +534,12 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: phalcon --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# 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) \
+	&& git checkout v4.1.1 \
 	# Custom:       Install command
 	&& cd build && ./install \
 	# Enabling
@@ -807,10 +807,10 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: swoole --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
-	# Custom:       Pecl command
-	&& pecl install -D 'enable-sockets="no" enable-openssl="yes" enable-http2="yes" enable-mysqlnd="yes" enable-swoole-json="no" enable-swoole-curl="yes" enable-cares="yes" with-postgres="yes"' swoole \
+	# Default:      Pecl command
+	&& pecl install swoole-4.8.12 \
 	# Enabling
 	&& docker-php-ext-enable swoole \
 	&& true

diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3
@@ -524,12 +524,12 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: phalcon --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# 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) \
+	&& git checkout v4.1.2 \
 	# Custom:       Install command
 	&& cd build && ./install \
 	# Enabling
@@ -797,10 +797,10 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: swoole --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
-	# Custom:       Pecl command
-	&& pecl install -D 'enable-sockets="no" enable-openssl="yes" enable-http2="yes" enable-mysqlnd="yes" enable-swoole-json="no" enable-swoole-curl="yes" enable-cares="yes" with-postgres="yes"' swoole \
+	# Default:      Pecl command
+	&& pecl install swoole-4.8.12 \
 	# Enabling
 	&& docker-php-ext-enable swoole \
 	&& true

diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4
@@ -783,10 +783,10 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: swoole --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
-	# Custom:       Pecl command
-	&& pecl install -D 'enable-sockets="no" enable-openssl="yes" enable-http2="yes" enable-mysqlnd="yes" enable-swoole-json="no" enable-swoole-curl="yes" enable-cares="yes" with-postgres="yes"' swoole \
+	# Default:      Pecl command
+	&& pecl install swoole-4.8.12 \
 	# Enabling
 	&& docker-php-ext-enable swoole \
 	&& true

diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2
@@ -148,6 +148,8 @@ RUN set -eux \
  \
 	\
 # -------------------- nvm --------------------
+	&& NODE_VERSION="17" \
+ \
 	&& NVM_VERSION="$( \
   curl -sS 'https://github.com/nvm-sh/nvm/releases' \
   | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
@@ -156,8 +158,7 @@ RUN set -eux \
   | tail -1 \
 )" \
 && mkdir -p /opt/nvm \
- \
-	&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
+&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
   | NVM_DIR="/opt/nvm" bash \
 \
 && { \
@@ -168,9 +169,9 @@ RUN set -eux \
 \
 && chown -R devilbox:devilbox "/opt/nvm" \
  \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
+	&& su  -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
 \
 && chmod 0777 /opt/nvm \
 && find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \

diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3
@@ -160,6 +160,8 @@ RUN set -eux \
  \
 	\
 # -------------------- nvm --------------------
+	&& NODE_VERSION="17" \
+ \
 	&& NVM_VERSION="$( \
   curl -sS 'https://github.com/nvm-sh/nvm/releases' \
   | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
@@ -168,8 +170,7 @@ RUN set -eux \
   | tail -1 \
 )" \
 && mkdir -p /opt/nvm \
- \
-	&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
+&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
   | NVM_DIR="/opt/nvm" bash \
 \
 && { \
@@ -180,9 +181,9 @@ RUN set -eux \
 \
 && chown -R devilbox:devilbox "/opt/nvm" \
  \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
+	&& su  -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
 \
 && chmod 0777 /opt/nvm \
 && find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \

diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4
@@ -160,6 +160,8 @@ RUN set -eux \
  \
 	\
 # -------------------- nvm --------------------
+	&& NODE_VERSION="17" \
+ \
 	&& NVM_VERSION="$( \
   curl -sS 'https://github.com/nvm-sh/nvm/releases' \
   | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
@@ -168,8 +170,7 @@ RUN set -eux \
   | tail -1 \
 )" \
 && mkdir -p /opt/nvm \
- \
-	&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
+&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
   | NVM_DIR="/opt/nvm" bash \
 \
 && { \
@@ -180,9 +181,9 @@ RUN set -eux \
 \
 && chown -R devilbox:devilbox "/opt/nvm" \
  \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
+	&& su  -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
 \
 && chmod 0777 /opt/nvm \
 && find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \

diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5
@@ -160,6 +160,8 @@ RUN set -eux \
  \
 	\
 # -------------------- nvm --------------------
+	&& NODE_VERSION="17" \
+ \
 	&& NVM_VERSION="$( \
   curl -sS 'https://github.com/nvm-sh/nvm/releases' \
   | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
@@ -168,8 +170,7 @@ RUN set -eux \
   | tail -1 \
 )" \
 && mkdir -p /opt/nvm \
- \
-	&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
+&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
   | NVM_DIR="/opt/nvm" bash \
 \
 && { \
@@ -180,9 +181,9 @@ RUN set -eux \
 \
 && chown -R devilbox:devilbox "/opt/nvm" \
  \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
+	&& su  -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
 \
 && chmod 0777 /opt/nvm \
 && find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \

diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6
@@ -162,6 +162,8 @@ RUN set -eux \
  \
 	\
 # -------------------- nvm --------------------
+	&& NODE_VERSION="17" \
+ \
 	&& NVM_VERSION="$( \
   curl -sS 'https://github.com/nvm-sh/nvm/releases' \
   | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
@@ -170,8 +172,7 @@ RUN set -eux \
   | tail -1 \
 )" \
 && mkdir -p /opt/nvm \
- \
-	&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
+&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
   | NVM_DIR="/opt/nvm" bash \
 \
 && { \
@@ -182,9 +183,9 @@ RUN set -eux \
 \
 && chown -R devilbox:devilbox "/opt/nvm" \
  \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
+	&& su  -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
 \
 && chmod 0777 /opt/nvm \
 && find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \
@@ -194,7 +195,7 @@ RUN set -eux \
 # -------------------- pgsql_client --------------------
 	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
   curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-  && echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+  && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
   && apt-get update; \
 fi \
  \

diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0
@@ -162,6 +162,8 @@ RUN set -eux \
  \
 	\
 # -------------------- nvm --------------------
+	&& NODE_VERSION="17" \
+ \
 	&& NVM_VERSION="$( \
   curl -sS 'https://github.com/nvm-sh/nvm/releases' \
   | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \
@@ -170,8 +172,7 @@ RUN set -eux \
   | tail -1 \
 )" \
 && mkdir -p /opt/nvm \
- \
-	&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
+&& curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" \
   | NVM_DIR="/opt/nvm" bash \
 \
 && { \
@@ -182,9 +183,9 @@ RUN set -eux \
 \
 && chown -R devilbox:devilbox "/opt/nvm" \
  \
-	&& su  -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \
-&& su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
+	&& su  -c ". /opt/nvm/nvm.sh; nvm install ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; nvm use ${NODE_VERSION}" devilbox \
+&& su  -c ". /opt/nvm/nvm.sh; corepack enable" devilbox \
 \
 && chmod 0777 /opt/nvm \
 && find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \
@@ -194,7 +195,7 @@ RUN set -eux \
 # -------------------- pgsql_client --------------------
 	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
   curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-  && echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+  && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
   && apt-get update; \
 fi \
  \