From 3ef75822241cfcecd27b99b7adc722c9f360953b Mon Sep 17 00:00:00 2001 From: Chris Park Date: Thu, 9 Jul 2026 14:08:12 +0930 Subject: [PATCH 1/3] AKD-831: parameterise ALPINE_VERSION for the upstream, failing the build if not present --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a712992..1a1091a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ ARG PHP_VERSION -FROM php:${PHP_VERSION}-alpine3.21 as standards-runtime +ARG ALPINE_VERSION +ARG ALPINE_VERSION_REQUIRED=${ALPINE_VERSION:?ALPINE_VERSION build argument is required} +FROM php:${PHP_VERSION}-alpine${ALPINE_VERSION} as standards-runtime # Install system dependencies RUN apk update && apk add --no-cache \ From 0094fa93a32d67b839c7a304bc75baf9fa153264 Mon Sep 17 00:00:00 2001 From: Chris Park Date: Thu, 9 Jul 2026 14:23:41 +0930 Subject: [PATCH 2/3] AKD-381: include Alpline version to build pipeline, with extended php versions --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 98f42a5..f466614 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,9 +7,9 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: [8.0, 8.1, 8.2] + php-version: [8.0, 8.1, 8.2, 8.3, 8.4] steps: - uses: actions/checkout@v2 with: ref: ${{ github.event.release.target_commitish }} - - run: docker build . --build-arg PHP_VERSION=${{ matrix.version }} + - run: docker build . --build-arg PHP_VERSION=${{ matrix.php-version }} --build-arg ALPINE_VERSION=${{ vars.ALPINE_VERSION }} -t my-app:${{ matrix.php-version }} From 04f0c8adf4d47ecc39c8b89a3eaa2bda5c7fc7ee Mon Sep 17 00:00:00 2001 From: Chris Park Date: Thu, 9 Jul 2026 14:40:00 +0930 Subject: [PATCH 3/3] AKD-381: update safe failing logic with outdated php versions removed --- .github/workflows/build.yml | 2 +- Dockerfile | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f466614..8808216 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-version: [8.0, 8.1, 8.2, 8.3, 8.4] + php-version: [8.3, 8.4] steps: - uses: actions/checkout@v2 with: diff --git a/Dockerfile b/Dockerfile index 1a1091a..e397b2d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,12 @@ ARG PHP_VERSION ARG ALPINE_VERSION -ARG ALPINE_VERSION_REQUIRED=${ALPINE_VERSION:?ALPINE_VERSION build argument is required} -FROM php:${PHP_VERSION}-alpine${ALPINE_VERSION} as standards-runtime + +FROM busybox:latest AS validator +ARG ALPINE_VERSION +RUN : "${ALPINE_VERSION:?ALPINE_VERSION build argument is required}" && touch /validated + +FROM php:${PHP_VERSION}-alpine${ALPINE_VERSION} AS standards-runtime +COPY --from=validator /validated /tmp/.validated # Install system dependencies RUN apk update && apk add --no-cache \