From 20f87ad3ce4107d66486a51fffc4e3181193b755 Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 18 Nov 2022 11:16:59 +0100 Subject: [PATCH 01/12] Fix workflow syntax errors --- .github/workflows/action-schedule_master.yml | 1 - .github/workflows/action-schedule_tags.yml | 1 - .github/workflows/action.yml | 1 - .github/workflows/params-nightly_master.yml | 6 ++++-- .github/workflows/params-nightly_tags.yml | 6 ++++-- .github/workflows/params.yml | 6 ++++-- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/action-schedule_master.yml b/.github/workflows/action-schedule_master.yml index 63c92591..c7714b94 100644 --- 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: diff --git a/.github/workflows/action-schedule_tags.yml b/.github/workflows/action-schedule_tags.yml index fa467ecc..d4ee2aeb 100644 --- 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: diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml index 2fef357e..58a9d4d1 100644 --- 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: diff --git a/.github/workflows/params-nightly_master.yml b/.github/workflows/params-nightly_master.yml index 1bc3cfa7..18f4d9a2 100644 --- 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 index 6b4afcdf..57390298 100644 --- 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 index 39113b73..be6a9ac4 100644 --- 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 From 0d11c229d4d7fc64004dcc13ee2286c534bf87c1 Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 18 Nov 2022 11:25:02 +0100 Subject: [PATCH 02/12] Empty-Commit From a671401bf2364d2c21221fd55ddf84222c15ed60 Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 18 Nov 2022 11:27:21 +0100 Subject: [PATCH 03/12] Trigger build From 05d8edb2fef4a3a57e6f94c847b86927048c24ab Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 19 Nov 2022 10:32:12 +0100 Subject: [PATCH 04/12] Fix Phalcon versions --- Dockerfiles/mods/Dockerfile-7.2 | 4 ++-- Dockerfiles/mods/Dockerfile-7.3 | 4 ++-- build/ansible/group_vars/all/mods.yml | 10 ++++++++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index 7907a8ba..cc001d42 100644 --- 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 diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index 49050c51..d219fe37 100644 --- 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 diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 5186ac63..0b60304d 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -946,6 +946,16 @@ extensions_available: git_url: https://github.com/phalcon/cphalcon git_ref: v3.4.4 command: cd build && ./install + 7.2: + type: git + git_url: https://github.com/phalcon/cphalcon + git_ref: v4.1.1 + command: cd build && ./install + 7.3: + type: git + git_url: https://github.com/phalcon/cphalcon + git_ref: v4.1.2 + command: cd build && ./install all: type: git git_url: https://github.com/phalcon/cphalcon From 7e3db52406c300a945f5b1b80d729db16ed2070f Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 19 Nov 2022 10:35:15 +0100 Subject: [PATCH 05/12] Fix build of phalcon --- Dockerfiles/mods/Dockerfile-7.2 | 6 +++--- Dockerfiles/mods/Dockerfile-7.3 | 6 +++--- Dockerfiles/mods/Dockerfile-7.4 | 6 +++--- build/ansible/group_vars/all/mods.yml | 9 +++++++++ 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index cc001d42..ec48e663 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -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 index d219fe37..95ef1877 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -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 index acd6248c..271b1e0d 100644 --- 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/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 0b60304d..acaae800 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -1179,6 +1179,15 @@ extensions_available: 7.1: type: pecl version: 4.4.26 + 7.2: + type: pecl + version: 4.8.12 + 7.3: + type: pecl + version: 4.8.12 + 7.4: + type: pecl + version: 4.8.12 all: type: pecl # Note: -D is only supported from PHP 7.2+ From 0a71f838f28ef48390942fbf1a72dbd6551a638c Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 19 Nov 2022 20:33:39 +0100 Subject: [PATCH 06/12] Update CHANGELOG --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55859e6d..b12aeab1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,16 @@ ## 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) + + ## Release 0.141 ### Fixed From b08e7d5c02468e0aa188806029dbad26a645fc61 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sun, 20 Nov 2022 11:10:28 +0100 Subject: [PATCH 07/12] Trigger Build From 79f087e21af324d8361091e170683a54bdea7527 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sun, 20 Nov 2022 11:57:41 +0100 Subject: [PATCH 08/12] Fixed installation of NodeJS --- CHANGELOG.md | 1 + Dockerfiles/work/Dockerfile-5.2 | 11 +++++----- Dockerfiles/work/Dockerfile-5.3 | 11 +++++----- Dockerfiles/work/Dockerfile-5.4 | 11 +++++----- Dockerfiles/work/Dockerfile-5.5 | 11 +++++----- Dockerfiles/work/Dockerfile-5.6 | 11 +++++----- Dockerfiles/work/Dockerfile-7.0 | 11 +++++----- Dockerfiles/work/Dockerfile-7.1 | 11 +++++----- Dockerfiles/work/Dockerfile-7.2 | 11 +++++----- Dockerfiles/work/Dockerfile-7.3 | 11 +++++----- Dockerfiles/work/Dockerfile-7.4 | 11 +++++----- Dockerfiles/work/Dockerfile-8.0 | 11 +++++----- Dockerfiles/work/Dockerfile-8.1 | 11 +++++----- Dockerfiles/work/Dockerfile-8.2 | 11 +++++----- build/ansible/group_vars/all/work.yml | 29 ++++++++++++++++++++++----- 15 files changed, 103 insertions(+), 70 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b12aeab1..51b403b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - 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 ## Release 0.141 diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index 6dc94c77..d40e93d9 100644 --- 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 index 630c625b..1e8bed75 100644 --- 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 index 97ae7bfd..0a615ed8 100644 --- 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 index b0b661f6..01255c3d 100644 --- 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 index 0bcce576..6b6788f3 100644 --- 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 \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index a4245532..70e29e86 100644 --- 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 \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index d6bfe85d..68530497 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -161,6 +161,8 @@ RUN set -eux \ \ \ # -------------------- nvm -------------------- + && NODE_VERSION="--lts" \ + \ && NVM_VERSION="$( \ curl -sS 'https://github.com/nvm-sh/nvm/releases' \ | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \ @@ -169,8 +171,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 \ \ && { \ @@ -181,9 +182,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-7.2 b/Dockerfiles/work/Dockerfile-7.2 index e5a3a0c1..c3315a3e 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -161,6 +161,8 @@ RUN set -eux \ \ \ # -------------------- nvm -------------------- + && NODE_VERSION="--lts" \ + \ && NVM_VERSION="$( \ curl -sS 'https://github.com/nvm-sh/nvm/releases' \ | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \ @@ -169,8 +171,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 \ \ && { \ @@ -181,9 +182,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-7.3 b/Dockerfiles/work/Dockerfile-7.3 index ba3c124e..269dc666 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -162,6 +162,8 @@ RUN set -eux \ \ \ # -------------------- nvm -------------------- + && NODE_VERSION="--lts" \ + \ && 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 \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index f40834ea..ae3f54ed 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -162,6 +162,8 @@ RUN set -eux \ \ \ # -------------------- nvm -------------------- + && NODE_VERSION="--lts" \ + \ && 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 \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 009e9d59..0c4c4114 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -162,6 +162,8 @@ RUN set -eux \ \ \ # -------------------- nvm -------------------- + && NODE_VERSION="--lts" \ + \ && 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 \ diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1 index 13661a68..ce4d8be1 100644 --- a/Dockerfiles/work/Dockerfile-8.1 +++ b/Dockerfiles/work/Dockerfile-8.1 @@ -162,6 +162,8 @@ RUN set -eux \ \ \ # -------------------- nvm -------------------- + && NODE_VERSION="--lts" \ + \ && 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 \ diff --git a/Dockerfiles/work/Dockerfile-8.2 b/Dockerfiles/work/Dockerfile-8.2 index b6f255e7..11e3921a 100644 --- a/Dockerfiles/work/Dockerfile-8.2 +++ b/Dockerfiles/work/Dockerfile-8.2 @@ -162,6 +162,8 @@ RUN set -eux \ \ \ # -------------------- nvm -------------------- + && NODE_VERSION="--lts" \ + \ && 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 \ diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index 108ced6c..c861e469 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -680,8 +680,28 @@ software_available: check: | su -c '. {{ nvm_home }}/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ && su -c '. {{ nvm_home }}/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ + 5.2: + pre: | + NODE_VERSION="17" \ + 5.3: + pre: | + NODE_VERSION="17" \ + 5.4: + pre: | + NODE_VERSION="17" \ + 5.5: + pre: | + NODE_VERSION="17" \ + 5.6: + pre: | + NODE_VERSION="17" \ + 7.0: + pre: | + NODE_VERSION="17" \ all: pre: | + NODE_VERSION="{{ node_version }}" \ + command: | NVM_VERSION="$( \ curl -sS 'https://github.com/nvm-sh/nvm/releases' \ | grep -Eo '/nvm-sh/nvm/releases/tag/v?[.0-9]+"' \ @@ -690,8 +710,7 @@ software_available: | tail -1 \ )" \ && mkdir -p {{ nvm_home }} \ - command: | - 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="{{ nvm_home }}" bash \ \ && { \ @@ -703,9 +722,9 @@ software_available: && chown -R devilbox:devilbox "{{ nvm_home }}" \ # Install latest and LTS version and yarn post: | - su -c '. {{ nvm_home }}/nvm.sh; nvm install {{ node_version }}' devilbox \ - && su -c '. {{ nvm_home }}/nvm.sh; nvm use {{ node_version }}' devilbox \ - && su -c '. {{ nvm_home }}/nvm.sh; corepack enable' devilbox \ + su -c ". {{ nvm_home }}/nvm.sh; nvm install ${NODE_VERSION}" devilbox \ + && su -c ". {{ nvm_home }}/nvm.sh; nvm use ${NODE_VERSION}" devilbox \ + && su -c ". {{ nvm_home }}/nvm.sh; corepack enable" devilbox \ \ && chmod 0777 {{ nvm_home }} \ && find {{ nvm_home }} -type f -print0 | xargs -n1 -0 chmod go+w \ From 90f5abc2fde305c81c96eff41adcb8525bbcbba5 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sun, 20 Nov 2022 11:58:02 +0100 Subject: [PATCH 09/12] Ensure to pull correct base image prior build --- .github/workflows/action-schedule_master.yml | 1 + .github/workflows/action-schedule_tags.yml | 1 + .github/workflows/action.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/action-schedule_master.yml b/.github/workflows/action-schedule_master.yml index c7714b94..ca76c76b 100644 --- a/.github/workflows/action-schedule_master.yml +++ b/.github/workflows/action-schedule_master.yml @@ -53,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 index d4ee2aeb..835d0f63 100644 --- a/.github/workflows/action-schedule_tags.yml +++ b/.github/workflows/action-schedule_tags.yml @@ -53,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 index 58a9d4d1..11ddf9d3 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action.yml @@ -53,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 From 397175aec87166197cdcf8e83a5a8d9871d8e5c9 Mon Sep 17 00:00:00 2001 From: cytopia Date: Mon, 21 Nov 2022 00:26:17 +0100 Subject: [PATCH 10/12] Fix postgreSQL install on PHP 5.6 --- CHANGELOG.md | 1 + Dockerfiles/work/Dockerfile-5.6 | 2 +- build/ansible/group_vars/all/work.yml | 5 ++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51b403b9..364d3b41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - 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 PostgreSQL client for PHP 5.6 ## Release 0.141 diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 6b6788f3..e1e3c7b3 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -195,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/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index c861e469..aa30bdbe 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -327,8 +327,7 @@ apt_repositories_available: deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[5.5].debian }}-pgdg main # [Stretch] 5.6: - deb: deb http://apt.postgresql.org/pub/repos/apt/ {{ os_release[5.6].debian }}-pgdg main - pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - + deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[5.6].debian }}-pgdg main # [Stretch] 7.0: deb: deb http://apt.postgresql.org/pub/repos/apt/ {{ os_release[7.0].debian }}-pgdg main @@ -806,7 +805,7 @@ software_available: pre: | 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/ {{ os_release[php_version].debian }}-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ + && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[php_version].debian }}-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ && apt-get update; \ fi \ command: | From b90a13482d0daadf4c16376cd2b1fb6e99be3a45 Mon Sep 17 00:00:00 2001 From: cytopia Date: Mon, 21 Nov 2022 00:36:21 +0100 Subject: [PATCH 11/12] Fix postgreSQL install on PHP 7.0 --- CHANGELOG.md | 3 ++- Dockerfiles/work/Dockerfile-7.0 | 2 +- build/ansible/group_vars/all/work.yml | 5 ++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 364d3b41..87c73f0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,8 @@ - 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 PostgreSQL client for PHP 5.6 +- Fixed installation of PostgreSQL client for PHP 5.6 +- Fixed installation of PostgreSQL client for PHP 7.0 ## Release 0.141 diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 70e29e86..658bfe8b 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -195,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/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index aa30bdbe..bd6775c0 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -330,8 +330,7 @@ apt_repositories_available: deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[5.6].debian }}-pgdg main # [Stretch] 7.0: - deb: deb http://apt.postgresql.org/pub/repos/apt/ {{ os_release[7.0].debian }}-pgdg main - pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - + deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[7.0].debian }}-pgdg main # [Buster] 7.1: deb: deb http://apt.postgresql.org/pub/repos/apt/ {{ os_release[7.1].debian }}-pgdg main @@ -817,7 +816,7 @@ software_available: pre: | 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/ {{ os_release[php_version].debian }}-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ + && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[php_version].debian }}-pgdg main" > /etc/apt/sources.list.d/pgsql.list \ && apt-get update; \ fi \ command: | From e6564db96d52495e5d4bc9f9470c9e2e3c38d3b0 Mon Sep 17 00:00:00 2001 From: cytopia Date: Mon, 21 Nov 2022 00:49:41 +0100 Subject: [PATCH 12/12] Disable Phalcon Devtools for PHP 7.4 as it breaks --- CHANGELOG.md | 1 + Dockerfiles/work/Dockerfile-7.4 | 15 --------------- build/ansible/group_vars/all/work.yml | 2 +- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 87c73f0e..6d9c2065 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - 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 diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index ae3f54ed..4ac666dd 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -328,20 +328,6 @@ fi \ && rm -rf /usr/local/src/mysqldump-secure \ \ \ -# -------------------- phalcon -------------------- - && git clone https://github.com/phalcon/phalcon-devtools /usr/local/src/phalcon-devtools \ -&& cd /usr/local/src/phalcon-devtools \ -&& git checkout $(git describe --abbrev=0 --tags) \ -&& COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer install \ - \ - && chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/phalcon-devtools \ -&& su - ${MY_USER} -c 'cd /usr/local/src/phalcon-devtools && ./phalcon.sh' \ -&& ln -sf /usr/local/src/phalcon-devtools/phalcon /usr/local/bin/phalcon \ -&& chmod +x phalcon \ -&& cd / \ -&& rm -rf /usr/local/src/phalcon-devtools/.git \ - \ - \ # -------------------- phpcs -------------------- && curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs \ && chmod +x /usr/local/bin/phpcs \ @@ -780,7 +766,6 @@ fi \ && laravel --version | grep -E '(Installer|version)\s*[0-9][.0-9]+' \ && linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' \ && mysqldump-secure --version | grep -E 'Version:\s*[0-9][.0-9]+' \ - && phalcon commands | grep -E '[0-9][.0-9]+' \ && phpcs --version | grep -E 'version [0-9][.0-9]+' \ && phpcbf --version | grep -E 'version [0-9][.0-9]+' \ && php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \ diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index bd6775c0..f4965552 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -1128,7 +1128,7 @@ software_available: && cd / \ && rm -rf /usr/local/src/mysqldump-secure \ phalcon: - disabled: [5.2, 8.0, 8.1, 8.2] + disabled: [5.2, 7.4, 8.0, 8.1, 8.2] check: phalcon commands | grep -E '[0-9][.0-9]+' 5.3: pre: |