From 755cdebad48031c9da6978d407330aef480873d3 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Tue, 11 Feb 2025 16:23:19 -0500 Subject: [PATCH 1/7] Update to ubuntu-latest for building images --- .github/workflows/default.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 183a617..f96f3b0 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -18,7 +18,7 @@ env: jobs: build: name: "Build: ${{ matrix.version }}" - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: fail-fast: false # Don't cancel other jobs if one fails From c38c0594da5c3e1fa034e47cda5d9c021dd9de35 Mon Sep 17 00:00:00 2001 From: Mike Potter Date: Tue, 18 Feb 2025 09:08:44 -0800 Subject: [PATCH 2/7] Remove php 7.4 and 8.0 from build --- .github/workflows/default.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index f96f3b0..275fa0f 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -24,8 +24,6 @@ jobs: fail-fast: false # Don't cancel other jobs if one fails matrix: include: - - version: "7.4" - - version: "8.0" - version: "8.1" - version: "8.2" - version: "8.3" From d001f2d0ddd5e387451323338a35e47943188917 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Thu, 10 Apr 2025 12:56:06 -0400 Subject: [PATCH 3/7] Update README so repo has activity to keep periodic builds running --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d841057..8467aa2 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ This image can be used to directly replace the Docksal CLI image if these additi ## Handling different PHP versions -The GitHub actions in `.github/workflows/default.yml` define a matrix of PHP versions being generated. Update this list with any new version needed. Must ensure that the upstream Docksal CLI image is available for each version of PHP. +The GitHub actions in `.github/workflows/default.yml` define a matrix of PHP versions being generated. Update this list with any new version needed. Must ensure that the upstream Docksal CLI image is available for each version of PHP. Currently on version 8.x images are generated. ## Resources From 617e7c7794f677adadef8904927fcc8fdf49ad05 Mon Sep 17 00:00:00 2001 From: Jonathan Hedstrom Date: Tue, 6 May 2025 13:06:38 -0700 Subject: [PATCH 4/7] Support PHP 8.4. --- .github/workflows/default.yml | 1 + build.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 275fa0f..62fb637 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -27,6 +27,7 @@ jobs: - version: "8.1" - version: "8.2" - version: "8.3" + - version: "8.4" env: VERSION: ${{ matrix.version }} diff --git a/build.sh b/build.sh index 283ee44..e6b5813 100755 --- a/build.sh +++ b/build.sh @@ -3,7 +3,7 @@ set -ex # Arguments: $1 CLI_VERSION -CLI_VERSION=${1:-8.3} +CLI_VERSION=${1:-8.4} # Install SQLite 3.x for Drupal 11 testing if CLI version >= 8.3 INSTALL_SQLITE=false From c00e8585d9051da367cd67496f067d86d4c531cf Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Thu, 4 Dec 2025 12:42:30 -0500 Subject: [PATCH 5/7] Activity to ensure actions keep running --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8467aa2..49dc1d1 100644 --- a/README.md +++ b/README.md @@ -32,3 +32,4 @@ Please email outrigger@phase2technology.com with security concerns. ## Maintainers [![Phase2 Logo](https://s3.amazonaws.com/phase2.public/logos/phase2-logo.png)](https://www.phase2technology.com) + From e2c391a92e7e2f6e87cf968307a9519fd956dc33 Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Thu, 5 Feb 2026 09:47:38 -0500 Subject: [PATCH 6/7] Ensure base image is refreshed for builds --- .github/workflows/default.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 62fb637..b035388 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -92,3 +92,5 @@ jobs: platforms: linux/amd64,linux/arm64 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.prep.outputs.tags }} + pull: true + no-cache: true From cf81aa42179823496232ab2baf694bb4064397ab Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Fri, 6 Mar 2026 16:35:32 -0500 Subject: [PATCH 7/7] Update Dockerfile --- src/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Dockerfile b/src/Dockerfile index 05a5c24..b32f6ea 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -21,7 +21,7 @@ RUN curl -o /usr/local/bin/kubectl -LO "https://storage.googleapis.com/kubernete helm init --client-only # Also install helm3 as `helm3` -RUN curl -s https://get.helm.sh/helm-v3.6.2-linux-${TARGETARCH}.tar.gz | sudo tar -C /tmp --no-same-owner -xvzf - linux-${TARGETARCH}/helm --strip-components 1 && \ +RUN curl -s https://get.helm.sh/helm-v3.19.0-linux-${TARGETARCH}.tar.gz | sudo tar -C /tmp --no-same-owner -xvzf - linux-${TARGETARCH}/helm --strip-components 1 && \ mv /tmp/helm /bin/helm3 # Install Kustomize