From f7e4b5dcd53c5c61b5b4a842789db40085b96512 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 2 Feb 2024 15:05:56 +0100 Subject: [PATCH 01/14] Bump PHP versions - PHP 8.1.27 - PHP 8.2.15 - PHP 8.3.2 --- 8.1/Dockerfile | 2 +- 8.2/Dockerfile | 2 +- 8.3/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/8.1/Dockerfile b/8.1/Dockerfile index 9beb1e37..8ef63ee7 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.25-fpm-bookworm as cli +FROM php:8.1.27-fpm-bookworm as cli ARG TARGETARCH ARG DEBIAN_FRONTEND=noninteractive diff --git a/8.2/Dockerfile b/8.2/Dockerfile index b1ebdf00..0fbe9804 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.12-fpm-bookworm as cli +FROM php:8.2.15-fpm-bookworm as cli ARG TARGETARCH ARG DEBIAN_FRONTEND=noninteractive diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 01830383..c6d76e56 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3.0RC6-fpm-bookworm as cli +FROM php:8.3.2-fpm-bookworm as cli ARG TARGETARCH ARG DEBIAN_FRONTEND=noninteractive From 8282e0ff10715de80b9322e0e2ce8d62f52f0d82 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 2 Feb 2024 15:07:01 +0100 Subject: [PATCH 02/14] Switch from felixfbecker.php-debug to xdebug.php-debug for VS Code Server --- 8.1/Dockerfile | 2 +- 8.2/Dockerfile | 2 +- 8.3/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/8.1/Dockerfile b/8.1/Dockerfile index 8ef63ee7..5743aa5d 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -432,7 +432,7 @@ COPY --chown=docker:docker config/code-server ${VSCODE_HOME} # Note: Have to use --user-data-dir with --install-extension instead of --config RUN set -xe; \ code-server --user-data-dir=${VSCODE_HOME} --install-extension eamodio.gitlens@${VSCODE_GITLENS_VERSION}; \ - code-server --user-data-dir=${VSCODE_HOME} --install-extension felixfbecker.php-debug@${VSCODE_XDEBUG_VERSION} + code-server --user-data-dir=${VSCODE_HOME} --install-extension xdebug.php-debug@${VSCODE_XDEBUG_VERSION} # Switch back to root (IMPORTANT!) USER root diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 0fbe9804..c3024ce7 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -432,7 +432,7 @@ COPY --chown=docker:docker config/code-server ${VSCODE_HOME} # Note: Have to use --user-data-dir with --install-extension instead of --config RUN set -xe; \ code-server --user-data-dir=${VSCODE_HOME} --install-extension eamodio.gitlens@${VSCODE_GITLENS_VERSION}; \ - code-server --user-data-dir=${VSCODE_HOME} --install-extension felixfbecker.php-debug@${VSCODE_XDEBUG_VERSION} + code-server --user-data-dir=${VSCODE_HOME} --install-extension xdebug.php-debug@${VSCODE_XDEBUG_VERSION} # Switch back to root (IMPORTANT!) USER root diff --git a/8.3/Dockerfile b/8.3/Dockerfile index c6d76e56..2961adaa 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -435,7 +435,7 @@ COPY --chown=docker:docker config/code-server ${VSCODE_HOME} # Note: Have to use --user-data-dir with --install-extension instead of --config RUN set -xe; \ code-server --user-data-dir=${VSCODE_HOME} --install-extension eamodio.gitlens@${VSCODE_GITLENS_VERSION}; \ - code-server --user-data-dir=${VSCODE_HOME} --install-extension felixfbecker.php-debug@${VSCODE_XDEBUG_VERSION} + code-server --user-data-dir=${VSCODE_HOME} --install-extension xdebug.php-debug@${VSCODE_XDEBUG_VERSION} # Switch back to root (IMPORTANT!) USER root From ff8d4780d3d9e0b6ad2d8757c4961edbc44a2833 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 2 Feb 2024 15:18:03 +0100 Subject: [PATCH 03/14] Bump VS Code Server versions - VS Code Server v4.20.1 - VS Code GitLens v14.7.0 - VS Code Xdebug v1.34.0 --- 8.1/Dockerfile | 6 +++--- 8.2/Dockerfile | 6 +++--- 8.3/Dockerfile | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/8.1/Dockerfile b/8.1/Dockerfile index 5743aa5d..9c33d8ff 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -414,9 +414,9 @@ USER docker ARG HOME=/home/docker ENV \ - CODE_SERVER_VERSION=4.10.1 \ - VSCODE_GITLENS_VERSION=13.2.2 \ - VSCODE_XDEBUG_VERSION=1.32.0 \ + CODE_SERVER_VERSION=4.20.1 \ + VSCODE_GITLENS_VERSION=14.7.0 \ + VSCODE_XDEBUG_VERSION=1.34.0 \ VSCODE_HOME="${HOME}/code-server" # Install code-server diff --git a/8.2/Dockerfile b/8.2/Dockerfile index c3024ce7..ec61a75d 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -414,9 +414,9 @@ USER docker ARG HOME=/home/docker ENV \ - CODE_SERVER_VERSION=4.10.1 \ - VSCODE_GITLENS_VERSION=13.2.2 \ - VSCODE_XDEBUG_VERSION=1.32.0 \ + CODE_SERVER_VERSION=4.20.1 \ + VSCODE_GITLENS_VERSION=14.7.0 \ + VSCODE_XDEBUG_VERSION=1.34.0 \ VSCODE_HOME="${HOME}/code-server" # Install code-server diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 2961adaa..e0ba8b4c 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -417,9 +417,9 @@ USER docker ARG HOME=/home/docker ENV \ - CODE_SERVER_VERSION=4.10.1 \ - VSCODE_GITLENS_VERSION=13.2.2 \ - VSCODE_XDEBUG_VERSION=1.32.0 \ + CODE_SERVER_VERSION=4.20.1 \ + VSCODE_GITLENS_VERSION=14.7.0 \ + VSCODE_XDEBUG_VERSION=1.34.0 \ VSCODE_HOME="${HOME}/code-server" # Install code-server From e6e226ca43364c36f46ae91a4dadeb19bd900cc7 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 2 Feb 2024 15:18:28 +0100 Subject: [PATCH 04/14] Bump versions - Composer v2.6.6 - Platform.sh CLI v5.0.8 - Acquia CLI v2.22.1 - Terminus v3.3.3 - jq v1.7.1 - yq v4.40.5 - nvm v0.39.7 - Node.js v20.11.0 LTS - yarn v1.22.21 --- 8.1/Dockerfile | 16 ++++++++-------- 8.2/Dockerfile | 16 ++++++++-------- 8.3/Dockerfile | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/8.1/Dockerfile b/8.1/Dockerfile index 9c33d8ff..166c8880 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -246,11 +246,11 @@ ENV \ DRUSH_VERSION=8.4.12 \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.9.0 \ - PLATFORMSH_CLI_VERSION=4.10.4 \ - ACQUIA_CLI_VERSION=2.18.0 \ - TERMINUS_VERSION=3.2.2 \ - JQ_VERSION=1.7 \ - YQ_VERSION=4.35.2 + PLATFORMSH_CLI_VERSION=5.0.8 \ + ACQUIA_CLI_VERSION=2.22.1 \ + TERMINUS_VERSION=3.3.3 \ + JQ_VERSION=1.7.1 \ + YQ_VERSION=4.40.5 RUN set -xe; \ # Composer 1.x curl -fsSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer1; \ @@ -326,9 +326,9 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil # Node.js (installed as user) ENV \ - NVM_VERSION=0.39.5 \ - NODE_VERSION=18.17.0 \ - YARN_VERSION=1.22.19 + NVM_VERSION=0.39.7 \ + NODE_VERSION=20.11.0 \ + YARN_VERSION=1.22.21 # Don't use -x here, as the output may be excessive RUN set -e; \ # NVM and a defaut Node.js version diff --git a/8.2/Dockerfile b/8.2/Dockerfile index ec61a75d..b67094b0 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -246,11 +246,11 @@ ENV \ DRUSH_VERSION=8.4.12 \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.9.0 \ - PLATFORMSH_CLI_VERSION=4.10.4 \ - ACQUIA_CLI_VERSION=2.18.0 \ - TERMINUS_VERSION=3.2.2 \ - JQ_VERSION=1.7 \ - YQ_VERSION=4.35.2 + PLATFORMSH_CLI_VERSION=5.0.8 \ + ACQUIA_CLI_VERSION=2.22.1 \ + TERMINUS_VERSION=3.3.3 \ + JQ_VERSION=1.7.1 \ + YQ_VERSION=4.40.5 RUN set -xe; \ # Composer 1.x curl -fsSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer1; \ @@ -326,9 +326,9 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil # Node.js (installed as user) ENV \ - NVM_VERSION=0.39.5 \ - NODE_VERSION=18.17.0 \ - YARN_VERSION=1.22.19 + NVM_VERSION=0.39.7 \ + NODE_VERSION=20.11.0 \ + YARN_VERSION=1.22.21 # Don't use -x here, as the output may be excessive RUN set -e; \ # NVM and a defaut Node.js version diff --git a/8.3/Dockerfile b/8.3/Dockerfile index e0ba8b4c..5c5091d9 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -249,11 +249,11 @@ ENV \ DRUSH_VERSION=8.4.12 \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.9.0 \ - PLATFORMSH_CLI_VERSION=4.10.4 \ - ACQUIA_CLI_VERSION=2.18.0 \ - TERMINUS_VERSION=3.2.2 \ - JQ_VERSION=1.7 \ - YQ_VERSION=4.35.2 + PLATFORMSH_CLI_VERSION=5.0.8 \ + ACQUIA_CLI_VERSION=2.22.1 \ + TERMINUS_VERSION=3.3.3 \ + JQ_VERSION=1.7.1 \ + YQ_VERSION=4.40.5 RUN set -xe; \ # Composer 1.x curl -fsSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer1; \ @@ -329,9 +329,9 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil # Node.js (installed as user) ENV \ - NVM_VERSION=0.39.5 \ - NODE_VERSION=18.17.0 \ - YARN_VERSION=1.22.19 + NVM_VERSION=0.39.7 \ + NODE_VERSION=20.11.0 \ + YARN_VERSION=1.22.21 # Don't use -x here, as the output may be excessive RUN set -e; \ # NVM and a defaut Node.js version From 495d89b292bffbbadfe49b07c6a807320f821657 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 2 Feb 2024 15:19:08 +0100 Subject: [PATCH 05/14] Use stable xdebug release for PHP 8.3 --- 8.3/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 5c5091d9..3149c872 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -190,8 +190,7 @@ RUN set -xe; \ memcached \ redis \ ssh2 \ - # xdebug PHP 8.3 compatibility is in beta \ - xdebug-beta \ + xdebug \ xhprof \ ;\ docker-php-ext-enable \ From 5b2dfe93b4ae2b4425d17b075e5be3f15cb26b8e Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 2 Feb 2024 16:33:55 +0100 Subject: [PATCH 06/14] Switched to Platform.sh CLI v4.14.1 (legacy-cli) --- 8.1/Dockerfile | 3 ++- 8.2/Dockerfile | 3 ++- 8.3/Dockerfile | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/8.1/Dockerfile b/8.1/Dockerfile index 166c8880..64a3ac9e 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -246,7 +246,8 @@ ENV \ DRUSH_VERSION=8.4.12 \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.9.0 \ - PLATFORMSH_CLI_VERSION=5.0.8 \ + # platformsh/legacy-cli + PLATFORMSH_CLI_VERSION=4.14.1 \ ACQUIA_CLI_VERSION=2.22.1 \ TERMINUS_VERSION=3.3.3 \ JQ_VERSION=1.7.1 \ diff --git a/8.2/Dockerfile b/8.2/Dockerfile index b67094b0..c5678f67 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -246,7 +246,8 @@ ENV \ DRUSH_VERSION=8.4.12 \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.9.0 \ - PLATFORMSH_CLI_VERSION=5.0.8 \ + # platformsh/legacy-cli + PLATFORMSH_CLI_VERSION=4.14.1 \ ACQUIA_CLI_VERSION=2.22.1 \ TERMINUS_VERSION=3.3.3 \ JQ_VERSION=1.7.1 \ diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 3149c872..8a195dd3 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -248,7 +248,8 @@ ENV \ DRUSH_VERSION=8.4.12 \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.9.0 \ - PLATFORMSH_CLI_VERSION=5.0.8 \ + # platformsh/legacy-cli + PLATFORMSH_CLI_VERSION=4.14.1 \ ACQUIA_CLI_VERSION=2.22.1 \ TERMINUS_VERSION=3.3.3 \ JQ_VERSION=1.7.1 \ From d8293bc50a680f3dd48ac81f1a999f1277a8f21e Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 2 Feb 2024 16:34:43 +0100 Subject: [PATCH 07/14] Pinned yarn at v1.22.19 Newer version don't install (missing some release artifacts). --- 8.1/Dockerfile | 3 ++- 8.2/Dockerfile | 3 ++- 8.3/Dockerfile | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/8.1/Dockerfile b/8.1/Dockerfile index 64a3ac9e..66e6e3e1 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -329,7 +329,8 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil ENV \ NVM_VERSION=0.39.7 \ NODE_VERSION=20.11.0 \ - YARN_VERSION=1.22.21 + # yarn releases above 1.22.19 don't install + YARN_VERSION=1.22.19 # Don't use -x here, as the output may be excessive RUN set -e; \ # NVM and a defaut Node.js version diff --git a/8.2/Dockerfile b/8.2/Dockerfile index c5678f67..64534754 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -329,7 +329,8 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil ENV \ NVM_VERSION=0.39.7 \ NODE_VERSION=20.11.0 \ - YARN_VERSION=1.22.21 + # yarn releases above 1.22.19 don't install + YARN_VERSION=1.22.19 # Don't use -x here, as the output may be excessive RUN set -e; \ # NVM and a defaut Node.js version diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 8a195dd3..4f1ac1fd 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -331,7 +331,8 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil ENV \ NVM_VERSION=0.39.7 \ NODE_VERSION=20.11.0 \ - YARN_VERSION=1.22.21 + # yarn releases above 1.22.19 don't install + YARN_VERSION=1.22.19 # Don't use -x here, as the output may be excessive RUN set -e; \ # NVM and a defaut Node.js version From dae8f153f09624672ba8f175f1132e5af8e22068 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 2 Feb 2024 17:19:40 +0100 Subject: [PATCH 08/14] Updated terminus test --- tests/test.bats | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test.bats b/tests/test.bats index 4cfe3734..049fce25 100755 --- a/tests/test.bats +++ b/tests/test.bats @@ -217,7 +217,8 @@ _healthcheck_wait () unset output # Check Terminus version - run docker exec -u docker "$NAME" bash -lc 'set -x; terminus --version | grep "^Terminus ${TERMINUS_VERSION}$"' + # --no-ansi is used to strip color codes from the output, otherwise the grep will fail + run docker exec -u docker "$NAME" bash -lc 'set -x; terminus --no-ansi --version | grep "^Terminus ${TERMINUS_VERSION}$"' [[ ${status} == 0 ]] unset output From 526069ae35b9c72d3207a44e3065ddad10ea4e24 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 2 Feb 2024 17:30:06 +0100 Subject: [PATCH 09/14] Updated GitHub Actions versions --- .github/workflows/default.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml index 8a2776a1..3ecc4e19 100644 --- a/.github/workflows/default.yaml +++ b/.github/workflows/default.yaml @@ -64,7 +64,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Environment variables run: | @@ -158,7 +158,7 @@ jobs: bats-version: '1.3.0' - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Environment variables run: | @@ -201,7 +201,7 @@ jobs: # Dynamic variable names cannot be used when mapping step outputs to job outputs. # Step outputs cannot be accessed directly from other jobs. Dead end. - name: Store test results - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test-results path: ${{ github.workspace }}/test-results-*.txt @@ -228,7 +228,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Environment variables run: | @@ -245,7 +245,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Retrieve test results - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: test-results - From b4fe2558f12cfd1b80586d3db7290625addba2d0 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 9 Feb 2024 11:11:26 +0100 Subject: [PATCH 10/14] Enable ftp extension for PHP 8.2 and 8.3 This is no longer enabled by default upstream --- 8.2/Dockerfile | 1 + 8.3/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 64534754..6e81368f 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -164,6 +164,7 @@ RUN set -xe; \ bz2 \ calendar\ exif \ + ftp \ gd \ gettext \ imap \ diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 4f1ac1fd..b6eac01e 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -164,6 +164,7 @@ RUN set -xe; \ bz2 \ calendar\ exif \ + ftp \ gd \ gettext \ imap \ From c761c89176a968129f7d9cad8fdffc94a70e03b6 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 9 Feb 2024 11:13:32 +0100 Subject: [PATCH 11/14] MS ODBC driver repo and key --- 8.1/Dockerfile | 8 +++----- 8.2/Dockerfile | 8 +++----- 8.3/Dockerfile | 8 +++----- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/8.1/Dockerfile b/8.1/Dockerfile index 66e6e3e1..a31a0102 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -208,11 +208,9 @@ RUN set -xe; \ # MSSQL PHP client RUN set -xe; \ - # Repo for msodbcsql18 (MS ODBC driver), required by pecl/sqlsrv and pecl/pdo_sqlsrv - curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | apt-key add -; \ - # TODO: Using Ubuntu 22.04 packages as a temporary fix (until addressed upstream in MS repos). - #curl -fsSL https://packages.microsoft.com/config/debian/12/prod.list -o /etc/apt/sources.list.d/mssql.list; \ - curl -fsSL https://packages.microsoft.com/config/ubuntu/22.04/prod.list -o /etc/apt/sources.list.d/mssql.list; \ + # Repo and key for msodbcsql18 (MS ODBC driver), required by pecl/sqlsrv and pecl/pdo_sqlsrv + curl -fsSL https://packages.microsoft.com/config/debian/12/prod.list -o /etc/apt/sources.list.d/mssql.list; \ + curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg; \ \ buildDeps=" \ unixodbc-dev \ diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 6e81368f..b8be9313 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -209,11 +209,9 @@ RUN set -xe; \ # MSSQL PHP client RUN set -xe; \ - # Repo for msodbcsql18 (MS ODBC driver), required by pecl/sqlsrv and pecl/pdo_sqlsrv - curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | apt-key add -; \ - # TODO: Using Ubuntu 22.04 packages as a temporary fix (until addressed upstream in MS repos). - #curl -fsSL https://packages.microsoft.com/config/debian/12/prod.list -o /etc/apt/sources.list.d/mssql.list; \ - curl -fsSL https://packages.microsoft.com/config/ubuntu/22.04/prod.list -o /etc/apt/sources.list.d/mssql.list; \ + # Repo and key for msodbcsql18 (MS ODBC driver), required by pecl/sqlsrv and pecl/pdo_sqlsrv + curl -fsSL https://packages.microsoft.com/config/debian/12/prod.list -o /etc/apt/sources.list.d/mssql.list; \ + curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg; \ \ buildDeps=" \ unixodbc-dev \ diff --git a/8.3/Dockerfile b/8.3/Dockerfile index b6eac01e..831c537f 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -211,11 +211,9 @@ RUN set -xe; \ # MSSQL PHP client RUN set -xe; \ - # Repo for msodbcsql18 (MS ODBC driver), required by pecl/sqlsrv and pecl/pdo_sqlsrv - curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | apt-key add -; \ - # TODO: Using Ubuntu 22.04 packages as a temporary fix (until addressed upstream in MS repos). - #curl -fsSL https://packages.microsoft.com/config/debian/12/prod.list -o /etc/apt/sources.list.d/mssql.list; \ - curl -fsSL https://packages.microsoft.com/config/ubuntu/22.04/prod.list -o /etc/apt/sources.list.d/mssql.list; \ + # Repo and key for msodbcsql18 (MS ODBC driver), required by pecl/sqlsrv and pecl/pdo_sqlsrv + curl -fsSL https://packages.microsoft.com/config/debian/12/prod.list -o /etc/apt/sources.list.d/mssql.list; \ + curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg; \ \ buildDeps=" \ unixodbc-dev \ From 9e18f360685387c4dd1def7ca1f6f73f9b6d6206 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 9 Feb 2024 11:14:47 +0100 Subject: [PATCH 12/14] imagick@master for PHP 8.3 Install imagick@master for PHP 8.3 using mlocati/install-php-extensions --- 8.3/Dockerfile | 9 ++++++++- 8.3/tests/php-modules.sh | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 831c537f..42c529f0 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -186,7 +186,7 @@ RUN set -xe; \ pecl install >/dev/null Date: Fri, 9 Feb 2024 13:48:33 +0100 Subject: [PATCH 13/14] Compatibility fix for actions/upload-artifact@v4 --- .github/workflows/default.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml index 3ecc4e19..de666dce 100644 --- a/.github/workflows/default.yaml +++ b/.github/workflows/default.yaml @@ -203,8 +203,10 @@ jobs: - name: Store test results uses: actions/upload-artifact@v4 with: - name: test-results + name: test-results-${{ env.GIT_SHA7 }}-${{ env.VERSION_PREFIX }}${{ env.VERSION }}-${{ env.ARCH }} path: ${{ github.workspace }}/test-results-*.txt + if-no-files-found: error + overwrite: true push: name: "Push: ${{ matrix.version }}/multi" @@ -247,7 +249,8 @@ jobs: name: Retrieve test results uses: actions/download-artifact@v4 with: - name: test-results + pattern: test-results-${{ env.GIT_SHA7 }}-* + merge-multiple: true - # Generate persistent tags (edge, stable, release) name: Docker image tags From e64dd5f000ccd1a33864a5ae00bac26abc620125 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 9 Feb 2024 15:22:29 +0100 Subject: [PATCH 14/14] Updated Docker Github Actions - docker/login-action@v3 - docker/build-push-action@v5 --- .github/workflows/default.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml index de666dce..06568ac8 100644 --- a/.github/workflows/default.yaml +++ b/.github/workflows/default.yaml @@ -92,14 +92,14 @@ jobs: docker info - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - # Build and cache image in the registry name: Build image - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: context: ${{ env.BUILD_DIR }} file: ${{ env.BUILD_DIR }}/Dockerfile @@ -241,7 +241,7 @@ jobs: - # Login to Docker Hub name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }}