From 6fce348daee70956e3daa49a890d5331e7fe3d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arne=20J=C3=B8rgensen?= <arne@arnested.dk>
Date: Fri, 6 Sep 2024 10:36:20 +0200
Subject: [PATCH 1/3] Let update script find multiarch SHA's

Update PHP images to use multiarch SHA's
---
 Dockerfile                   | 8 ++++----
 bin/update-php-images-sha.sh | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6908956..4c13319 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
 ARG php="8.2"
 
 ## Base PHP images
-FROM php:8.0-fpm-alpine@sha256:173daec831fa47844c876258a19741c7a1928524b5e1936a2b1e7c1f58ec1b12 AS php8.0
-FROM php:8.1-fpm-alpine@sha256:a13add2aa7bdf1debe91ec56ba951823261295c907e00c2b6ffec69e842ba992 AS php8.1
-FROM php:8.2-fpm-alpine@sha256:747e3f4843c75203c5e6aff70429368048cbeaa2a6e79b81f1a4e700b9e05add AS php8.2
-FROM php:8.3-fpm-alpine@sha256:dc3e7bef05e4e8960d1138bd6da361a05a073e0bd40cd072144691d71ec5b834 AS php8.3
+FROM php:8.0-fpm-alpine@sha256:bbf76d84a693fae1e0d2a259db70c9c47f41bd5a6ec3d339ba397939e7875dd8 AS php8.0
+FROM php:8.1-fpm-alpine@sha256:d25c61d176d62c1929bd1d155fc4073b5d8d0db3f4a2d1ae67f580439409fc7f AS php8.1
+FROM php:8.2-fpm-alpine@sha256:a16bc43404e602adb0f8f9662a1319f83d85daf23110bf7e02152a8a0e3d7e5e AS php8.2
+FROM php:8.3-fpm-alpine@sha256:421373ae5f16b3afa03506de0ecbb4dcf39e4fe817b2a40b5f5c1f23c041dffa AS php8.3
 
 ## Helper images
 FROM blackfire/blackfire:2@sha256:a701c54bdba874443b76ce27d2a6fbbe30e8ee517eb38823df4337b3461eef69 AS blackfire
diff --git a/bin/update-php-images-sha.sh b/bin/update-php-images-sha.sh
index 41eddf2..7793c18 100755
--- a/bin/update-php-images-sha.sh
+++ b/bin/update-php-images-sha.sh
@@ -6,6 +6,7 @@ mapfile -t versions < <(grep -E '^FROM .* AS php[0-9\.]+$' Dockerfile | cut -f 4
 
 for version in "${versions[@]}"; do
 	image=$(grep "AS ${version}" Dockerfile | cut -f 2 -d ' ' | cut -f 1 -d @)
-	new=$(docker buildx imagetools inspect --raw "${image}" | jq -r '.manifests[0].digest')
+	docker pull "${image}"
+	new=$(docker image inspect "${image}" | jq -r '.[0].RepoDigests[0]' | cut -f 2 -d @)
 	sed -i "s#FROM .*AS ${version}#FROM ${image}@${new} AS ${version}#" Dockerfile
 done

From 4194c9bb5f4cf2da7f482163e40a1942883b708f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arne=20J=C3=B8rgensen?= <arne@arnested.dk>
Date: Fri, 6 Sep 2024 11:15:45 +0200
Subject: [PATCH 2/3] Improve caching in GitHub Action workflows

---
 .github/workflows/push.yml    | 2 ++
 .github/workflows/release.yml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 0468d5f..c420de4 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -39,6 +39,8 @@ jobs:
           context: .
           platforms: ${{ matrix.platform }}
           build-args: "php=${{ matrix.php }}"
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
           labels: |
             org.opencontainers.image.title=PHP ${{ matrix.php }}
             org.opencontainers.image.description=Docker image for PHP ${{ matrix.php }} FPM
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 692253a..0202b81 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -53,6 +53,8 @@ jobs:
           context: .
           platforms: linux/amd64,linux/arm64
           build-args: "php=${{ matrix.php }}"
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
           labels: |
             org.opencontainers.image.title=PHP ${{ matrix.php }}
             org.opencontainers.image.description=Docker image for PHP ${{ matrix.php }} FPM

From 9f124864296aa0bf702def30633c1ec6cce27df1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arne=20J=C3=B8rgensen?= <arne@arnested.dk>
Date: Fri, 6 Sep 2024 11:18:04 +0200
Subject: [PATCH 3/3] Move layers around to improve chance of reusing expensive
 layers

---
 Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4c13319..597fe77 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,8 +23,6 @@ HEALTHCHECK --interval=10s --start-period=90s CMD netstat -ltn | grep -c ":9000"
 
 COPY context/ /
 
-COPY --from=blackfire /usr/local/bin/blackfire /usr/bin
-COPY --from=composer /usr/bin/composer /usr/bin
 COPY --from=php-extension-installer /usr/bin/install-php-extensions /usr/bin
 
 RUN <<EOT
@@ -36,6 +34,9 @@ RUN <<EOT
     adduser -H -D -S -G wheel -u 1000 linuxhost
 EOT
 
+COPY --from=blackfire /usr/local/bin/blackfire /usr/bin
+COPY --from=composer /usr/bin/composer /usr/bin
+
 SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
 RUN curl https://endoflife.date/api/php/${php}.json| jq '{support,eol,lts}' > /etc/eol.json