From 27e7d4527368feb3d3f5bf343e40f264fb7c0b77 Mon Sep 17 00:00:00 2001 From: Shelane French Date: Fri, 9 Feb 2024 15:24:05 -0800 Subject: [PATCH 01/25] updates tools composer 2.7.0 => 2.7.1 wpcli 2.9.0 => 2.10.0 acquia cli 2.22.1 => 2.22.2 yq 4.40.5 => 4.40.7 --- 8.1/Dockerfile | 8 ++++---- 8.2/Dockerfile | 8 ++++---- 8.3/Dockerfile | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/8.1/Dockerfile b/8.1/Dockerfile index a31a0102..744c75ba 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -240,16 +240,16 @@ RUN set -xe; \ ENV \ COMPOSER_DEFAULT_VERSION=2 \ COMPOSER_VERSION=1.10.27 \ - COMPOSER2_VERSION=2.7.0 \ + COMPOSER2_VERSION=2.7.1 \ DRUSH_VERSION=8.4.12 \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ - WPCLI_VERSION=2.9.0 \ + WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli PLATFORMSH_CLI_VERSION=4.14.1 \ - ACQUIA_CLI_VERSION=2.22.1 \ + ACQUIA_CLI_VERSION=2.22.2 \ TERMINUS_VERSION=3.3.3 \ JQ_VERSION=1.7.1 \ - YQ_VERSION=4.40.5 + YQ_VERSION=4.40.7 RUN set -xe; \ # Composer 1.x curl -fsSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer1; \ diff --git a/8.2/Dockerfile b/8.2/Dockerfile index b8be9313..20f47012 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -241,16 +241,16 @@ RUN set -xe; \ ENV \ COMPOSER_DEFAULT_VERSION=2 \ COMPOSER_VERSION=1.10.27 \ - COMPOSER2_VERSION=2.7.0 \ + COMPOSER2_VERSION=2.7.1 \ DRUSH_VERSION=8.4.12 \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ - WPCLI_VERSION=2.9.0 \ + WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli PLATFORMSH_CLI_VERSION=4.14.1 \ - ACQUIA_CLI_VERSION=2.22.1 \ + ACQUIA_CLI_VERSION=2.22.2 \ TERMINUS_VERSION=3.3.3 \ JQ_VERSION=1.7.1 \ - YQ_VERSION=4.40.5 + YQ_VERSION=4.40.7 RUN set -xe; \ # Composer 1.x curl -fsSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer1; \ diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 42c529f0..55110f17 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -250,16 +250,16 @@ RUN set -xe; \ ENV \ COMPOSER_DEFAULT_VERSION=2 \ COMPOSER_VERSION=1.10.27 \ - COMPOSER2_VERSION=2.7.0 \ + COMPOSER2_VERSION=2.7.1 \ DRUSH_VERSION=8.4.12 \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ - WPCLI_VERSION=2.9.0 \ + WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli PLATFORMSH_CLI_VERSION=4.14.1 \ - ACQUIA_CLI_VERSION=2.22.1 \ + ACQUIA_CLI_VERSION=2.22.2 \ TERMINUS_VERSION=3.3.3 \ JQ_VERSION=1.7.1 \ - YQ_VERSION=4.40.5 + YQ_VERSION=4.40.7 RUN set -xe; \ # Composer 1.x curl -fsSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer1; \ From c1f9190d04b9bb3a72946cfdbd5d9f53a2a217b1 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Mon, 12 Feb 2024 12:05:33 +0100 Subject: [PATCH 02/25] Switch to bats-core/bats-action@1.5.4 for CI tests mig4/setup-bats is no longer maintained. bats-core/bats-action is it's fork under the official bats-core org on Github. --- .github/workflows/default.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml index 06568ac8..3c61e6a1 100644 --- a/.github/workflows/default.yaml +++ b/.github/workflows/default.yaml @@ -153,9 +153,7 @@ jobs: steps: - name: Setup Bats - uses: mig4/setup-bats@v1 - with: - bats-version: '1.3.0' + uses: bats-core/bats-action@1.5.4 - name: Checkout uses: actions/checkout@v4 From 80d6d411b89b162ce581e892d84bdf2e7db9b551 Mon Sep 17 00:00:00 2001 From: Shelane French Date: Wed, 21 Feb 2024 19:15:13 -0800 Subject: [PATCH 03/25] updates platformsh 4.14.1 => 4.15.3 --- 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 744c75ba..da5628c8 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -245,7 +245,7 @@ ENV \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli - PLATFORMSH_CLI_VERSION=4.14.1 \ + PLATFORMSH_CLI_VERSION=4.15.3 \ ACQUIA_CLI_VERSION=2.22.2 \ TERMINUS_VERSION=3.3.3 \ JQ_VERSION=1.7.1 \ diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 20f47012..733ebfaf 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -246,7 +246,7 @@ ENV \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli - PLATFORMSH_CLI_VERSION=4.14.1 \ + PLATFORMSH_CLI_VERSION=4.15.3 \ ACQUIA_CLI_VERSION=2.22.2 \ TERMINUS_VERSION=3.3.3 \ JQ_VERSION=1.7.1 \ diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 55110f17..d48d71a7 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -255,7 +255,7 @@ ENV \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli - PLATFORMSH_CLI_VERSION=4.14.1 \ + PLATFORMSH_CLI_VERSION=4.15.3 \ ACQUIA_CLI_VERSION=2.22.2 \ TERMINUS_VERSION=3.3.3 \ JQ_VERSION=1.7.1 \ From 5d38df89955399652f940ebe77ce7cd1a2e19965 Mon Sep 17 00:00:00 2001 From: Shelane French Date: Mon, 26 Feb 2024 07:34:37 -0800 Subject: [PATCH 04/25] updates yq 4.40.7 => 4.42.1 --- 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 da5628c8..20a4589f 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -249,7 +249,7 @@ ENV \ ACQUIA_CLI_VERSION=2.22.2 \ TERMINUS_VERSION=3.3.3 \ JQ_VERSION=1.7.1 \ - YQ_VERSION=4.40.7 + YQ_VERSION=4.42.1 RUN set -xe; \ # Composer 1.x curl -fsSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer1; \ diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 733ebfaf..de6494eb 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -250,7 +250,7 @@ ENV \ ACQUIA_CLI_VERSION=2.22.2 \ TERMINUS_VERSION=3.3.3 \ JQ_VERSION=1.7.1 \ - YQ_VERSION=4.40.7 + YQ_VERSION=4.42.1 RUN set -xe; \ # Composer 1.x curl -fsSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer1; \ diff --git a/8.3/Dockerfile b/8.3/Dockerfile index d48d71a7..9b7cef87 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -259,7 +259,7 @@ ENV \ ACQUIA_CLI_VERSION=2.22.2 \ TERMINUS_VERSION=3.3.3 \ JQ_VERSION=1.7.1 \ - YQ_VERSION=4.40.7 + YQ_VERSION=4.42.1 RUN set -xe; \ # Composer 1.x curl -fsSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer1; \ From 58eb65eb9f8b3833f96e127fc43cfeffb9b7157e Mon Sep 17 00:00:00 2001 From: Shelane French Date: Thu, 29 Feb 2024 07:49:12 -0800 Subject: [PATCH 05/25] updates terminus 3.3.3 => 3.3.5 --- 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 20a4589f..a0048de9 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -247,7 +247,7 @@ ENV \ # platformsh/legacy-cli PLATFORMSH_CLI_VERSION=4.15.3 \ ACQUIA_CLI_VERSION=2.22.2 \ - TERMINUS_VERSION=3.3.3 \ + TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ YQ_VERSION=4.42.1 RUN set -xe; \ diff --git a/8.2/Dockerfile b/8.2/Dockerfile index de6494eb..dc845971 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -248,7 +248,7 @@ ENV \ # platformsh/legacy-cli PLATFORMSH_CLI_VERSION=4.15.3 \ ACQUIA_CLI_VERSION=2.22.2 \ - TERMINUS_VERSION=3.3.3 \ + TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ YQ_VERSION=4.42.1 RUN set -xe; \ diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 9b7cef87..760587c0 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -257,7 +257,7 @@ ENV \ # platformsh/legacy-cli PLATFORMSH_CLI_VERSION=4.15.3 \ ACQUIA_CLI_VERSION=2.22.2 \ - TERMINUS_VERSION=3.3.3 \ + TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ YQ_VERSION=4.42.1 RUN set -xe; \ From b915e9dd611596918e4bccc13dc1499eddab05f8 Mon Sep 17 00:00:00 2001 From: Shelane French Date: Tue, 5 Mar 2024 12:46:52 -0800 Subject: [PATCH 06/25] updates platformsh 4.15.3 => 4.16.0 --- 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 a0048de9..807c785a 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -245,7 +245,7 @@ ENV \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli - PLATFORMSH_CLI_VERSION=4.15.3 \ + PLATFORMSH_CLI_VERSION=4.16.0 \ ACQUIA_CLI_VERSION=2.22.2 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ diff --git a/8.2/Dockerfile b/8.2/Dockerfile index dc845971..38eee5a4 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -246,7 +246,7 @@ ENV \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli - PLATFORMSH_CLI_VERSION=4.15.3 \ + PLATFORMSH_CLI_VERSION=4.16.0 \ ACQUIA_CLI_VERSION=2.22.2 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 760587c0..b4699475 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -255,7 +255,7 @@ ENV \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli - PLATFORMSH_CLI_VERSION=4.15.3 \ + PLATFORMSH_CLI_VERSION=4.16.0 \ ACQUIA_CLI_VERSION=2.22.2 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ From 7b68ea6068a989ece38b1d5184be324fed01e58e Mon Sep 17 00:00:00 2001 From: Shelane French Date: Mon, 11 Mar 2024 13:46:22 -0700 Subject: [PATCH 07/25] updates composer 2.7.1 => 2.7.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 807c785a..37b562aa 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -240,7 +240,7 @@ RUN set -xe; \ ENV \ COMPOSER_DEFAULT_VERSION=2 \ COMPOSER_VERSION=1.10.27 \ - COMPOSER2_VERSION=2.7.1 \ + COMPOSER2_VERSION=2.7.2 \ DRUSH_VERSION=8.4.12 \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.10.0 \ diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 38eee5a4..42edd366 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -241,7 +241,7 @@ RUN set -xe; \ ENV \ COMPOSER_DEFAULT_VERSION=2 \ COMPOSER_VERSION=1.10.27 \ - COMPOSER2_VERSION=2.7.1 \ + COMPOSER2_VERSION=2.7.2 \ DRUSH_VERSION=8.4.12 \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.10.0 \ diff --git a/8.3/Dockerfile b/8.3/Dockerfile index b4699475..51a79e68 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -250,7 +250,7 @@ RUN set -xe; \ ENV \ COMPOSER_DEFAULT_VERSION=2 \ COMPOSER_VERSION=1.10.27 \ - COMPOSER2_VERSION=2.7.1 \ + COMPOSER2_VERSION=2.7.2 \ DRUSH_VERSION=8.4.12 \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.10.0 \ From b819b6ee9d5806146213c6d4e81eacfe474ded87 Mon Sep 17 00:00:00 2001 From: Shelane French Date: Thu, 14 Mar 2024 06:54:42 -0700 Subject: [PATCH 08/25] updates acli 2.22.2 => 2.23.0 --- 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 37b562aa..a8d88c17 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -246,7 +246,7 @@ ENV \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli PLATFORMSH_CLI_VERSION=4.16.0 \ - ACQUIA_CLI_VERSION=2.22.2 \ + ACQUIA_CLI_VERSION=2.23.0 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ YQ_VERSION=4.42.1 diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 42edd366..043640ad 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -247,7 +247,7 @@ ENV \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli PLATFORMSH_CLI_VERSION=4.16.0 \ - ACQUIA_CLI_VERSION=2.22.2 \ + ACQUIA_CLI_VERSION=2.23.0 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ YQ_VERSION=4.42.1 diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 51a79e68..1963e90a 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -256,7 +256,7 @@ ENV \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli PLATFORMSH_CLI_VERSION=4.16.0 \ - ACQUIA_CLI_VERSION=2.22.2 \ + ACQUIA_CLI_VERSION=2.23.0 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ YQ_VERSION=4.42.1 From 55e71a394c94506e051509e4c85106ec2f5b6955 Mon Sep 17 00:00:00 2001 From: Shelane French Date: Wed, 20 Mar 2024 08:10:57 -0700 Subject: [PATCH 09/25] updates acli 2.23.0 => 2.23.1 --- 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 a8d88c17..7b588aa5 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -246,7 +246,7 @@ ENV \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli PLATFORMSH_CLI_VERSION=4.16.0 \ - ACQUIA_CLI_VERSION=2.23.0 \ + ACQUIA_CLI_VERSION=2.23.1 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ YQ_VERSION=4.42.1 diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 043640ad..81ea00b4 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -247,7 +247,7 @@ ENV \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli PLATFORMSH_CLI_VERSION=4.16.0 \ - ACQUIA_CLI_VERSION=2.23.0 \ + ACQUIA_CLI_VERSION=2.23.1 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ YQ_VERSION=4.42.1 diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 1963e90a..40263bd3 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -256,7 +256,7 @@ ENV \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli PLATFORMSH_CLI_VERSION=4.16.0 \ - ACQUIA_CLI_VERSION=2.23.0 \ + ACQUIA_CLI_VERSION=2.23.1 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ YQ_VERSION=4.42.1 From f97d252ccb1d73403fc57079cddeb210453ff79a Mon Sep 17 00:00:00 2001 From: Shelane French Date: Fri, 22 Mar 2024 11:32:18 -0700 Subject: [PATCH 10/25] updates platformsh 4.16.0 => 4.17.0 --- 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 7b588aa5..1496b174 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -245,7 +245,7 @@ ENV \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli - PLATFORMSH_CLI_VERSION=4.16.0 \ + PLATFORMSH_CLI_VERSION=4.17.0 \ ACQUIA_CLI_VERSION=2.23.1 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 81ea00b4..b6671234 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -246,7 +246,7 @@ ENV \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli - PLATFORMSH_CLI_VERSION=4.16.0 \ + PLATFORMSH_CLI_VERSION=4.17.0 \ ACQUIA_CLI_VERSION=2.23.1 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 40263bd3..62b481e9 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -255,7 +255,7 @@ ENV \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli - PLATFORMSH_CLI_VERSION=4.16.0 \ + PLATFORMSH_CLI_VERSION=4.17.0 \ ACQUIA_CLI_VERSION=2.23.1 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ From e2d8ff941d198500a20265b10066d3fff6fb1ac7 Mon Sep 17 00:00:00 2001 From: Shelane French Date: Mon, 25 Mar 2024 07:57:47 -0700 Subject: [PATCH 11/25] updates yq 4.42.1 => 4.43.1 --- 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 1496b174..cf736610 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -249,7 +249,7 @@ ENV \ ACQUIA_CLI_VERSION=2.23.1 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ - YQ_VERSION=4.42.1 + YQ_VERSION=4.43.1 RUN set -xe; \ # Composer 1.x curl -fsSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer1; \ diff --git a/8.2/Dockerfile b/8.2/Dockerfile index b6671234..0b0234bd 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -250,7 +250,7 @@ ENV \ ACQUIA_CLI_VERSION=2.23.1 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ - YQ_VERSION=4.42.1 + YQ_VERSION=4.43.1 RUN set -xe; \ # Composer 1.x curl -fsSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer1; \ diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 62b481e9..48336811 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -259,7 +259,7 @@ ENV \ ACQUIA_CLI_VERSION=2.23.1 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ - YQ_VERSION=4.42.1 + YQ_VERSION=4.43.1 RUN set -xe; \ # Composer 1.x curl -fsSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer1; \ From 2ce3b75677feb03077d3a2dd92d5f0d2f4589505 Mon Sep 17 00:00:00 2001 From: Shelane French Date: Mon, 25 Mar 2024 12:26:36 -0700 Subject: [PATCH 12/25] updates acli 2.23.1 => 2.23.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 cf736610..ac3a6fac 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -246,7 +246,7 @@ ENV \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli PLATFORMSH_CLI_VERSION=4.17.0 \ - ACQUIA_CLI_VERSION=2.23.1 \ + ACQUIA_CLI_VERSION=2.23.2 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ YQ_VERSION=4.43.1 diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 0b0234bd..7e3d9af6 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -247,7 +247,7 @@ ENV \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli PLATFORMSH_CLI_VERSION=4.17.0 \ - ACQUIA_CLI_VERSION=2.23.1 \ + ACQUIA_CLI_VERSION=2.23.2 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ YQ_VERSION=4.43.1 diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 48336811..52178e40 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -256,7 +256,7 @@ ENV \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli PLATFORMSH_CLI_VERSION=4.17.0 \ - ACQUIA_CLI_VERSION=2.23.1 \ + ACQUIA_CLI_VERSION=2.23.2 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ YQ_VERSION=4.43.1 From 14f70bfe6b1fe93f2e8e493ea765b2ee8fda109e Mon Sep 17 00:00:00 2001 From: Shelane French Date: Wed, 3 Apr 2024 12:43:33 -0700 Subject: [PATCH 13/25] updates acli 2.23.2 => 2.24.0 --- 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 ac3a6fac..d547d4c7 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -246,7 +246,7 @@ ENV \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli PLATFORMSH_CLI_VERSION=4.17.0 \ - ACQUIA_CLI_VERSION=2.23.2 \ + ACQUIA_CLI_VERSION=2.24.0 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ YQ_VERSION=4.43.1 diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 7e3d9af6..6700dc1d 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -247,7 +247,7 @@ ENV \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli PLATFORMSH_CLI_VERSION=4.17.0 \ - ACQUIA_CLI_VERSION=2.23.2 \ + ACQUIA_CLI_VERSION=2.24.0 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ YQ_VERSION=4.43.1 diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 52178e40..8d0ba6c2 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -256,7 +256,7 @@ ENV \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli PLATFORMSH_CLI_VERSION=4.17.0 \ - ACQUIA_CLI_VERSION=2.23.2 \ + ACQUIA_CLI_VERSION=2.24.0 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ YQ_VERSION=4.43.1 From 2b5036146257d04e1a0d3d03c5b130aaa99d01ee Mon Sep 17 00:00:00 2001 From: Shelane French Date: Fri, 12 Apr 2024 08:18:14 -0700 Subject: [PATCH 14/25] updates platformsh 4.17.0 => 4.18.0 --- 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 d547d4c7..96bbe8ed 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -245,7 +245,7 @@ ENV \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli - PLATFORMSH_CLI_VERSION=4.17.0 \ + PLATFORMSH_CLI_VERSION=4.18.0 \ ACQUIA_CLI_VERSION=2.24.0 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 6700dc1d..45519f2a 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -246,7 +246,7 @@ ENV \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli - PLATFORMSH_CLI_VERSION=4.17.0 \ + PLATFORMSH_CLI_VERSION=4.18.0 \ ACQUIA_CLI_VERSION=2.24.0 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 8d0ba6c2..48180a38 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -255,7 +255,7 @@ ENV \ DRUPAL_CONSOLE_LAUNCHER_VERSION=1.9.7 \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli - PLATFORMSH_CLI_VERSION=4.17.0 \ + PLATFORMSH_CLI_VERSION=4.18.0 \ ACQUIA_CLI_VERSION=2.24.0 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ From 08f955c5b26299926ede74d10f027253c50072f6 Mon Sep 17 00:00:00 2001 From: Shelane French Date: Thu, 18 Apr 2024 07:30:16 -0700 Subject: [PATCH 15/25] updates acli 2.24.0 => 2.25.0 --- 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 96bbe8ed..10b5f3b9 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -246,7 +246,7 @@ ENV \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli PLATFORMSH_CLI_VERSION=4.18.0 \ - ACQUIA_CLI_VERSION=2.24.0 \ + ACQUIA_CLI_VERSION=2.25.0 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ YQ_VERSION=4.43.1 diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 45519f2a..0f5fb8db 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -247,7 +247,7 @@ ENV \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli PLATFORMSH_CLI_VERSION=4.18.0 \ - ACQUIA_CLI_VERSION=2.24.0 \ + ACQUIA_CLI_VERSION=2.25.0 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ YQ_VERSION=4.43.1 diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 48180a38..8acc2821 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -256,7 +256,7 @@ ENV \ WPCLI_VERSION=2.10.0 \ # platformsh/legacy-cli PLATFORMSH_CLI_VERSION=4.18.0 \ - ACQUIA_CLI_VERSION=2.24.0 \ + ACQUIA_CLI_VERSION=2.25.0 \ TERMINUS_VERSION=3.3.5 \ JQ_VERSION=1.7.1 \ YQ_VERSION=4.43.1 From 620f17e6d24f40e03fa27b0bae90f0fb1ad1ad5b Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 19 Apr 2024 14:43:17 +0200 Subject: [PATCH 16/25] Minor CI updates --- .github/scripts/docker-tags.sh | 2 +- .github/workflows/default.yaml | 40 ++++++++++++++++++---------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/.github/scripts/docker-tags.sh b/.github/scripts/docker-tags.sh index 9631c143..415664aa 100755 --- a/.github/scripts/docker-tags.sh +++ b/.github/scripts/docker-tags.sh @@ -35,7 +35,7 @@ set_output() { # Print with new lines for output in build logs (IFS=$'\n'; echo "${outputArr[*]}") # Using newlines in output variables does not seem to work, so we'll use comas - (IFS=$','; echo "::set-output name=tags::${outputArr[*]}") + (IFS=$','; echo tags="${outputArr[*]}" | tee -a ${$GITHUB_OUTPUT}) } # Image tags diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml index 3c61e6a1..f7ea3766 100644 --- a/.github/workflows/default.yaml +++ b/.github/workflows/default.yaml @@ -1,15 +1,15 @@ -name: Docker Build and Push +name: Build, Test, Push on: schedule: - - cron: '0 10 * * 0' # Every Sunday at 10AM + - cron: "0 10 * * 0" # Every Sunday at 10AM push: branches: - master - develop - feature/* tags: - - 'v*.*.*' + - "v*.*.*" workflow_dispatch: # Allow manually triggering a build defaults: @@ -19,7 +19,7 @@ defaults: env: IMAGE: docksal/cli UPSTREAM_IMAGE: debian - LATEST_VERSION: '8.2' + LATEST_VERSION: "8.2" DOCKSAL_VERSION: develop jobs: @@ -34,27 +34,27 @@ jobs: - platform: linux/amd64 arch: amd64 - version: '8.1' + version: "8.1" - platform: linux/amd64 arch: amd64 - version: '8.2' + version: "8.2" - platform: linux/amd64 arch: amd64 - version: '8.3' + version: "8.3" - platform: linux/arm64 arch: arm64 - version: '8.1' + version: "8.1" - platform: linux/arm64 arch: arm64 - version: '8.2' + version: "8.2" - platform: linux/arm64 arch: arm64 - version: '8.3' + version: "8.3" env: ARCH: ${{ matrix.arch }} @@ -76,6 +76,7 @@ jobs: echo ARM64_HOST_SSH_CERT="$(ssh-keyscan -t rsa ${{ secrets.ARM64_HOST }} 2>/dev/null)" | tee -a ${GITHUB_ENV} - # Switch docker context to a remote arm64 host + # Used for building heavy images that take too long to build using QEMU + for native arm64 testing. name: Switch to arm64 builder host if: ${{ env.ARCH == 'arm64' }} uses: arwynfr/actions-docker-context@v2 @@ -123,27 +124,27 @@ jobs: - platform: linux/amd64 arch: amd64 - version: '8.1' + version: "8.1" - platform: linux/amd64 arch: amd64 - version: '8.2' + version: "8.2" - platform: linux/amd64 arch: amd64 - version: '8.3' + version: "8.3" - platform: linux/arm64 arch: arm64 - version: '8.1' + version: "8.1" - platform: linux/arm64 arch: arm64 - version: '8.2' + version: "8.2" - platform: linux/arm64 arch: arm64 - version: '8.3' + version: "8.3" env: ARCH: ${{ matrix.arch }} @@ -168,6 +169,7 @@ jobs: echo ARM64_HOST_SSH_CERT="$(ssh-keyscan -t rsa ${{ secrets.ARM64_HOST }} 2>/dev/null)" | tee -a ${GITHUB_ENV} - # Switch docker context to a remote arm64 host + # Used for building heavy images that take too long to build using QEMU + for native arm64 testing. name: Switch to arm64 builder host if: ${{ env.ARCH == 'arm64' }} uses: arwynfr/actions-docker-context@v2 @@ -217,9 +219,9 @@ jobs: strategy: matrix: version: - - '8.1' - - '8.2' - - '8.3' + - "8.1" + - "8.2" + - "8.3" env: VERSION_PREFIX: php From e222fdac3fa0323b5aaff337c89b6375e3ccb6f2 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 19 Apr 2024 14:46:37 +0200 Subject: [PATCH 17/25] PHP version bumps (8.1.28, 8.2.18, 8.3.6) --- 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 10b5f3b9..ad623d0c 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.27-fpm-bookworm as cli +FROM php:8.1.28-fpm-bookworm as cli ARG TARGETARCH ARG DEBIAN_FRONTEND=noninteractive diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 0f5fb8db..2da32b31 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.15-fpm-bookworm as cli +FROM php:8.2.18-fpm-bookworm as cli ARG TARGETARCH ARG DEBIAN_FRONTEND=noninteractive diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 8acc2821..29e25a0c 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3.2-fpm-bookworm as cli +FROM php:8.3.6-fpm-bookworm as cli ARG TARGETARCH ARG DEBIAN_FRONTEND=noninteractive From efd053e18626584798ee05f872151ff90bc8f28b Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 19 Apr 2024 15:49:48 +0200 Subject: [PATCH 18/25] Reduce noise in runtime logs --- 8.1/config/php/zz-php-fpm.conf | 4 ++++ 8.1/config/supervisor/supervisord.conf | 6 ++++++ 8.2/config/php/zz-php-fpm.conf | 4 ++++ 8.2/config/supervisor/supervisord.conf | 6 ++++++ 8.3/config/php/zz-php-fpm.conf | 4 ++++ 8.3/config/supervisor/supervisord.conf | 6 ++++++ 6 files changed, 30 insertions(+) diff --git a/8.1/config/php/zz-php-fpm.conf b/8.1/config/php/zz-php-fpm.conf index d4fb5e22..f045760d 100644 --- a/8.1/config/php/zz-php-fpm.conf +++ b/8.1/config/php/zz-php-fpm.conf @@ -3,12 +3,16 @@ [global] ; This pid file is used for Docker healthcheck pid = /run/php-fpm.pid +; Reduce noise in logs +log_level = error [www] user = docker catch_workers_output = yes listen = 0.0.0.0:9000 clear_env = no +; Do not log php-fpm accesses (see web container for http access) +access.log = /dev/null ; PHP (FPM) settings ; See zz-php.ini for global (CLI and FPM) PHP settings diff --git a/8.1/config/supervisor/supervisord.conf b/8.1/config/supervisor/supervisord.conf index 32c7217a..05e9e01e 100644 --- a/8.1/config/supervisor/supervisord.conf +++ b/8.1/config/supervisor/supervisord.conf @@ -4,3 +4,9 @@ nodaemon = true # This way logs can be reviewed with docker logs. # Additionalluy, logs from specific services are forwarded to individual files on disk. loglevel = debug +# Mute the "CRIT Supervisor is running as root" warning in logs. +user=root +# Mute the "CRIT Server 'unix_http_server' running without any HTTP authentication checking" warning in logs +[unix_http_server] +username = dummy +password = dummy diff --git a/8.2/config/php/zz-php-fpm.conf b/8.2/config/php/zz-php-fpm.conf index d4fb5e22..f045760d 100644 --- a/8.2/config/php/zz-php-fpm.conf +++ b/8.2/config/php/zz-php-fpm.conf @@ -3,12 +3,16 @@ [global] ; This pid file is used for Docker healthcheck pid = /run/php-fpm.pid +; Reduce noise in logs +log_level = error [www] user = docker catch_workers_output = yes listen = 0.0.0.0:9000 clear_env = no +; Do not log php-fpm accesses (see web container for http access) +access.log = /dev/null ; PHP (FPM) settings ; See zz-php.ini for global (CLI and FPM) PHP settings diff --git a/8.2/config/supervisor/supervisord.conf b/8.2/config/supervisor/supervisord.conf index 32c7217a..05e9e01e 100644 --- a/8.2/config/supervisor/supervisord.conf +++ b/8.2/config/supervisor/supervisord.conf @@ -4,3 +4,9 @@ nodaemon = true # This way logs can be reviewed with docker logs. # Additionalluy, logs from specific services are forwarded to individual files on disk. loglevel = debug +# Mute the "CRIT Supervisor is running as root" warning in logs. +user=root +# Mute the "CRIT Server 'unix_http_server' running without any HTTP authentication checking" warning in logs +[unix_http_server] +username = dummy +password = dummy diff --git a/8.3/config/php/zz-php-fpm.conf b/8.3/config/php/zz-php-fpm.conf index d4fb5e22..f045760d 100644 --- a/8.3/config/php/zz-php-fpm.conf +++ b/8.3/config/php/zz-php-fpm.conf @@ -3,12 +3,16 @@ [global] ; This pid file is used for Docker healthcheck pid = /run/php-fpm.pid +; Reduce noise in logs +log_level = error [www] user = docker catch_workers_output = yes listen = 0.0.0.0:9000 clear_env = no +; Do not log php-fpm accesses (see web container for http access) +access.log = /dev/null ; PHP (FPM) settings ; See zz-php.ini for global (CLI and FPM) PHP settings diff --git a/8.3/config/supervisor/supervisord.conf b/8.3/config/supervisor/supervisord.conf index 32c7217a..05e9e01e 100644 --- a/8.3/config/supervisor/supervisord.conf +++ b/8.3/config/supervisor/supervisord.conf @@ -4,3 +4,9 @@ nodaemon = true # This way logs can be reviewed with docker logs. # Additionalluy, logs from specific services are forwarded to individual files on disk. loglevel = debug +# Mute the "CRIT Supervisor is running as root" warning in logs. +user=root +# Mute the "CRIT Server 'unix_http_server' running without any HTTP authentication checking" warning in logs +[unix_http_server] +username = dummy +password = dummy From ef185cf38d5eb74906573255c4507a9a354c5537 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 19 Apr 2024 16:31:31 +0200 Subject: [PATCH 19/25] CI fixes --- .github/scripts/docker-tags.sh | 2 +- .github/workflows/default.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/scripts/docker-tags.sh b/.github/scripts/docker-tags.sh index 415664aa..1cc2f9ee 100755 --- a/.github/scripts/docker-tags.sh +++ b/.github/scripts/docker-tags.sh @@ -35,7 +35,7 @@ set_output() { # Print with new lines for output in build logs (IFS=$'\n'; echo "${outputArr[*]}") # Using newlines in output variables does not seem to work, so we'll use comas - (IFS=$','; echo tags="${outputArr[*]}" | tee -a ${$GITHUB_OUTPUT}) + (IFS=$','; echo tags="${outputArr[*]}" | tee -a ${GITHUB_OUTPUT}) } # Image tags diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml index f7ea3766..f7dfbcd9 100644 --- a/.github/workflows/default.yaml +++ b/.github/workflows/default.yaml @@ -79,7 +79,7 @@ jobs: # Used for building heavy images that take too long to build using QEMU + for native arm64 testing. name: Switch to arm64 builder host if: ${{ env.ARCH == 'arm64' }} - uses: arwynfr/actions-docker-context@v2 + uses: docksal/actions/docker-context@main with: docker_host: "ssh://build-agent@${{ secrets.ARM64_HOST }}" context_name: arm64-host @@ -154,7 +154,7 @@ jobs: steps: - name: Setup Bats - uses: bats-core/bats-action@1.5.4 + uses: bats-core/bats-action@2.0.0 - name: Checkout uses: actions/checkout@v4 @@ -172,7 +172,7 @@ jobs: # Used for building heavy images that take too long to build using QEMU + for native arm64 testing. name: Switch to arm64 builder host if: ${{ env.ARCH == 'arm64' }} - uses: arwynfr/actions-docker-context@v2 + uses: docksal/actions/docker-context@main with: docker_host: "ssh://build-agent@${{ secrets.ARM64_HOST }}" context_name: arm64-host From 51482a643591f09d3baad2f11bccc0043f0d21ff Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 19 Apr 2024 16:52:06 +0200 Subject: [PATCH 20/25] Fix platform.sh integration test --- tests/test.bats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test.bats b/tests/test.bats index 049fce25..3aaf5670 100755 --- a/tests/test.bats +++ b/tests/test.bats @@ -359,7 +359,7 @@ _healthcheck_wait () unset output # Confirm authentication works - run docker exec -u docker "${NAME}" bash -lc 'platform auth:info -n' + run docker exec -u docker "${NAME}" bash -lc 'platform auth:info --no-interaction' [[ ${status} == 0 ]] [[ ! "${output}" =~ "Invalid API token" ]] [[ "${output}" =~ "developer@docksal.io" ]] From 27a4a401646275af0273a78ad33f5d67609970e9 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 19 Apr 2024 18:14:33 +0200 Subject: [PATCH 21/25] Support for corepack yarn installation --- 8.1/Dockerfile | 13 ++++++++----- 8.2/Dockerfile | 13 ++++++++----- 8.3/Dockerfile | 13 ++++++++----- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/8.1/Dockerfile b/8.1/Dockerfile index ad623d0c..f8547315 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -327,8 +327,9 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil ENV \ NVM_VERSION=0.39.7 \ NODE_VERSION=20.11.0 \ - # yarn releases above 1.22.19 don't install - YARN_VERSION=1.22.19 + # Yarn (Classic v1) + # https://github.com/yarnpkg/yarn/releases + YARN_VERSION=1.22.22 # Don't use -x here, as the output may be excessive RUN set -e; \ # NVM and a defaut Node.js version @@ -336,9 +337,11 @@ RUN set -e; \ curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v${NVM_VERSION}/install.sh | bash >/dev/null; \ # Reload profile to load nvm (needed by Yarn installation below) . $HOME/.profile; \ - # Yarn - export YARN_PROFILE="$HOME/.profile"; \ - curl -fsSL https://yarnpkg.com/install.sh | bash -s -- --version ${YARN_VERSION} >/dev/null + # Yarn (Classic v1) + # Installing via npm to allow fore override with never versions via corepack + npm install -g yarn@${YARN_VERSION}; \ + # Enable corepack (allows installing project level yarn v2+ via yarn) + corepack enable ## Ruby bundler ## Don't use -x here, as the output may be excessive diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 2da32b31..0d32486e 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -328,8 +328,9 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil ENV \ NVM_VERSION=0.39.7 \ NODE_VERSION=20.11.0 \ - # yarn releases above 1.22.19 don't install - YARN_VERSION=1.22.19 + # Yarn (Classic v1) + # https://github.com/yarnpkg/yarn/releases + YARN_VERSION=1.22.22 # Don't use -x here, as the output may be excessive RUN set -e; \ # NVM and a defaut Node.js version @@ -337,9 +338,11 @@ RUN set -e; \ curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v${NVM_VERSION}/install.sh | bash >/dev/null; \ # Reload profile to load nvm (needed by Yarn installation below) . $HOME/.profile; \ - # Yarn - export YARN_PROFILE="$HOME/.profile"; \ - curl -fsSL https://yarnpkg.com/install.sh | bash -s -- --version ${YARN_VERSION} >/dev/null + # Yarn (Classic v1) + # Installing via npm to allow fore override with never versions via corepack + npm install -g yarn@${YARN_VERSION}; \ + # Enable corepack (allows installing project level yarn v2+ via yarn) + corepack enable ## Ruby bundler ## Don't use -x here, as the output may be excessive diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 29e25a0c..b6a357c8 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -337,8 +337,9 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil ENV \ NVM_VERSION=0.39.7 \ NODE_VERSION=20.11.0 \ - # yarn releases above 1.22.19 don't install - YARN_VERSION=1.22.19 + # Yarn (Classic v1) + # https://github.com/yarnpkg/yarn/releases + YARN_VERSION=1.22.22 # Don't use -x here, as the output may be excessive RUN set -e; \ # NVM and a defaut Node.js version @@ -346,9 +347,11 @@ RUN set -e; \ curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v${NVM_VERSION}/install.sh | bash >/dev/null; \ # Reload profile to load nvm (needed by Yarn installation below) . $HOME/.profile; \ - # Yarn - export YARN_PROFILE="$HOME/.profile"; \ - curl -fsSL https://yarnpkg.com/install.sh | bash -s -- --version ${YARN_VERSION} >/dev/null + # Yarn (Classic v1) + # Installing via npm to allow fore override with never versions via corepack + npm install -g yarn@${YARN_VERSION}; \ + # Enable corepack (allows installing project level yarn v2+ via yarn) + corepack enable ## Ruby bundler ## Don't use -x here, as the output may be excessive From eda3f741272ea7c112ab74281f133858c0b1b3f7 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 19 Apr 2024 20:17:56 +0200 Subject: [PATCH 22/25] Node.js v20.12.2 LTS --- 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 f8547315..86fb8354 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -326,7 +326,7 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil # Node.js (installed as user) ENV \ NVM_VERSION=0.39.7 \ - NODE_VERSION=20.11.0 \ + NODE_VERSION=20.12.2 \ # Yarn (Classic v1) # https://github.com/yarnpkg/yarn/releases YARN_VERSION=1.22.22 diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 0d32486e..3fce7a26 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -327,7 +327,7 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil # Node.js (installed as user) ENV \ NVM_VERSION=0.39.7 \ - NODE_VERSION=20.11.0 \ + NODE_VERSION=20.12.2 \ # Yarn (Classic v1) # https://github.com/yarnpkg/yarn/releases YARN_VERSION=1.22.22 diff --git a/8.3/Dockerfile b/8.3/Dockerfile index b6a357c8..26e24f5c 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -336,7 +336,7 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil # Node.js (installed as user) ENV \ NVM_VERSION=0.39.7 \ - NODE_VERSION=20.11.0 \ + NODE_VERSION=20.12.2 \ # Yarn (Classic v1) # https://github.com/yarnpkg/yarn/releases YARN_VERSION=1.22.22 From 52fc88564d3dedf85f09e71ecc7d48d05fddf7eb Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 19 Apr 2024 20:26:35 +0200 Subject: [PATCH 23/25] Set PHP 8.3 image as default/latest --- .github/workflows/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml index f7dfbcd9..14cd9900 100644 --- a/.github/workflows/default.yaml +++ b/.github/workflows/default.yaml @@ -19,7 +19,7 @@ defaults: env: IMAGE: docksal/cli UPSTREAM_IMAGE: debian - LATEST_VERSION: "8.2" + LATEST_VERSION: "8.3" DOCKSAL_VERSION: develop jobs: From b91ccf4ad53aa09813b4f18f89f721f281a0ff2c Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 19 Apr 2024 20:27:14 +0200 Subject: [PATCH 24/25] README.md refresh --- README.md | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 20277287..3f99cc7e 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,9 @@ This image focuses on console tools necessary to develop LAMP stack (and other w This image(s) is part of the [Docksal](https://docksal.io) image library. - ## Features -- Based on the official php-fpm Debian 11 (bullseye) images +- Based on the official php-fpm Debian 12 (bookworm) images - php/php-fpm (w/ xdebug), nodejs (via nvm), python, ruby - Framework specific tools for Drupal and Wordpress - Miscellaneous cli tools for day to day web development @@ -17,23 +16,16 @@ This image(s) is part of the [Docksal](https://docksal.io) image library. - [VS Code Server](https://github.com/cdr/code-server) (VS Code in the browser) - Multi-platform images (amd64/arm64) starting with v3.0.0 - ## Versions and image tag naming convention -- Stable versions v3 (amd64/arm64) - - `php8.0-3.0`, `php8.0`, `php8.0` - PHP 8.0 - - `php8.1-3.0`, `php8.1`, `php8.1`, `latest` - PHP 8.1 -- Development versions (amd64/arm64) - - `php8.0-edge` - PHP 8.0 - - `php8.1-edge` - PHP 8.0 -- Legacy versions v3 (amd64/arm64) - - `php7.3-3.0`, `php7.3-2`, `php7.3` - PHP 7.3 - - `php7.4-3.3`, `php7.4-3`, `php7.4` - PHP 7.4 -- Legacy versions v2 (amd64) - - `php7.3-2.13`, `php7.3-2`, `php7.3` - PHP 7.3 - - `php7.4-2.13`, `php7.4-2`, `php7.4` - PHP 7.4 - - `php8.0-2.13`, `php8.0`, `php8.0` - PHP 8.0 - +- Stable versions v3 + - `php8.1-3.8`, `php8.1` - PHP 8.1 + - `php8.2-3.8`, `php8.2` - PHP 8.2 + - `php8.3-3.8`, `php8.3`, `latest` - PHP 8.3 +- Development versions + - `php8.1-edge` - PHP 8.1 + - `php8.2-edge` - PHP 8.2 + - `php8.3-edge` - PHP 8.3 ## PHP @@ -54,8 +46,7 @@ manner (installing them with `apt-get` won't work). - SQLite - via `sqlite3`, `pdo_sqlite` - MySQL - via `mysqli`, `mysqlnd`, `pdo_mysql` - PostgreSQL - via `pgsql`, `pdo_pgsql` -- MSSQL - via `sqlsrv` and `pdo_sqlsrv` (amd64 only) - +- MSSQL - via `sqlsrv` and `pdo_sqlsrv` ### Using PHP Xdebug @@ -74,17 +65,16 @@ cli [See docs](https://docs.docksal.io/tools/xdebug/) on using Xdebug for web and cli PHP debugging. - ## NodeJS - nvm -- node v14.17.3 (following NodeJS LTS release cycle) -- yarn +- node v20.12.2 (following NodeJS LTS release cycle) +- yarn (classic v1) NodeJS is installed via `nvm` in the `docker` user's profile inside the image (`/home/docker/.nvm`). -If you need a different version of node, use `nvm` to install it, e.g., `nvm install 11.6.0`. -Then, use `nvm use 11.6.0` to use it in the current session or `nvm alias default 11.6.0` to use it by default. +If you need a different version of node, use `nvm` to install it, e.g., `nvm install 21.7.3`. +Then, use `nvm use 21.7.3` to use it in the current session or `nvm alias default 21.7.3` to use it by default. ## Python @@ -103,7 +93,6 @@ This image comes with a system level installed Ruby v2.7.x from upstream Debian - mysql, pgsql, and sqlsrv cli clients - imagemagick, ghostscript - mc, nano, rsync -- mhsendmail - cron ## Hosting provider tools @@ -114,14 +103,12 @@ This image comes with a system level installed Ruby v2.7.x from upstream Debian Also, see the [Secrets](#secrets) section below for more information on managing and using your hosting provider keys. - ## Customizing startup To run a custom startup script anytime the `cli` container has started, create a `startup.sh` file within the `.docksal/services/cli` directory. Additionally, make sure that the file is executable as well so that the container does not run into issues when attempting to execute the file. - ## Scheduling cron jobs Cron can be configured by making sure there is a `crontab` file located within `.docksal/services/cli`. The file should @@ -188,7 +175,6 @@ GIT_USER_EMAIL="git@example.com" GIT_USER_NAME="Docksal CLI" ``` - ## Coder (Visual Studio Code web IDE) From ae8d449540a6bd166c68fbe8918985f37f304dbf Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 19 Apr 2024 20:39:47 +0200 Subject: [PATCH 25/25] VS Code version bumps - VS Code Server v4.23.1 - VS Code GitLens v14.9.0 --- 8.1/Dockerfile | 4 ++-- 8.2/Dockerfile | 4 ++-- 8.3/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/8.1/Dockerfile b/8.1/Dockerfile index 86fb8354..7d1cf6dd 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -417,8 +417,8 @@ USER docker ARG HOME=/home/docker ENV \ - CODE_SERVER_VERSION=4.20.1 \ - VSCODE_GITLENS_VERSION=14.7.0 \ + CODE_SERVER_VERSION=4.23.1 \ + VSCODE_GITLENS_VERSION=14.9.0 \ VSCODE_XDEBUG_VERSION=1.34.0 \ VSCODE_HOME="${HOME}/code-server" diff --git a/8.2/Dockerfile b/8.2/Dockerfile index 3fce7a26..6cc9449b 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -418,8 +418,8 @@ USER docker ARG HOME=/home/docker ENV \ - CODE_SERVER_VERSION=4.20.1 \ - VSCODE_GITLENS_VERSION=14.7.0 \ + CODE_SERVER_VERSION=4.23.1 \ + VSCODE_GITLENS_VERSION=14.9.0 \ VSCODE_XDEBUG_VERSION=1.34.0 \ VSCODE_HOME="${HOME}/code-server" diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 26e24f5c..8e5826f8 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -427,8 +427,8 @@ USER docker ARG HOME=/home/docker ENV \ - CODE_SERVER_VERSION=4.20.1 \ - VSCODE_GITLENS_VERSION=14.7.0 \ + CODE_SERVER_VERSION=4.23.1 \ + VSCODE_GITLENS_VERSION=14.9.0 \ VSCODE_XDEBUG_VERSION=1.34.0 \ VSCODE_HOME="${HOME}/code-server"