From 058df5915c0e8184e246a56e2f8e85ffb05bbe92 Mon Sep 17 00:00:00 2001
From: arnested <190005+arnested@users.noreply.github.com>
Date: Thu, 12 Dec 2024 06:09:46 +0000
Subject: [PATCH 1/4] Update PHP Docker image SHAs

---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5da3f24..529939c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,10 +2,10 @@ ARG php="8.2"
 
 ## Base PHP images
 FROM php:8.0-fpm-alpine@sha256:bbf76d84a693fae1e0d2a259db70c9c47f41bd5a6ec3d339ba397939e7875dd8 AS php8.0
-FROM php:8.1-fpm-alpine@sha256:8ac8bf3413dc08471bb8134846018f19ec688c961d2581493bd7fe91cd72b9d2 AS php8.1
-FROM php:8.2-fpm-alpine@sha256:1a6fc2aaa306a3c12264b3d1d6832a598e98f1237090ff853dc6af5db8e5a8f2 AS php8.2
-FROM php:8.3-fpm-alpine@sha256:17fa7702b3d48eb0c064e3410474c81f703b3bcb7a7fe8073503e6c7f157a29a AS php8.3
-FROM php:8.4-fpm-alpine@sha256:79e748df9762464b4fbd27c079150b3fb5535bcdd1550daacf6dfce60fb9fb86 AS php8.4
+FROM php:8.1-fpm-alpine@sha256:2c43b8bd86bd92783b699b711b9bff3b4e327fbf7ad54596421e34ba92637302 AS php8.1
+FROM php:8.2-fpm-alpine@sha256:c523472426f614a75900f6078825db8e43dac2b7b3eba2bbe979b794014a944d AS php8.2
+FROM php:8.3-fpm-alpine@sha256:f629de30ba229744bf7a4019e146940cda8a50808f1c3fd0d05ddc72908ab71b AS php8.3
+FROM php:8.4-fpm-alpine@sha256:27ec40542bee352cb92da944c8598211bf40a8fd6af8006bf90d39c91672fc0a AS php8.4
 
 ## Helper images
 FROM blackfire/blackfire:2@sha256:1df0d05684ae180dc37a139d8bf01485fdbc37f654ef91ccbdb8072172110daa AS blackfire

From c9f9286efef6d20300d88f52be4b6c24b778d375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arne=20J=C3=B8rgensen?= <arne@arnested.dk>
Date: Thu, 12 Dec 2024 14:52:02 +0100
Subject: [PATCH 2/4] Upgrade mariadb-client to v11 in upstream alpione

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 529939c..a82b019 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,7 +28,7 @@ COPY --from=php-extension-installer /usr/bin/install-php-extensions /usr/bin
 
 RUN <<EOT
     set -eux
-    apk add --no-cache bash=~5 git=~2 jq=~1 mariadb-client=~10 msmtp=~1 patch=~2 unzip=~6 graphicsmagick=~1 sudo=~1 tini=~0
+    apk add --no-cache bash=~5 git=~2 jq=~1 mariadb-client=~11 msmtp=~1 patch=~2 unzip=~6 graphicsmagick=~1 sudo=~1 tini=~0
     install-php-extensions ${php_enable_extensions}
     if [ "${php}" != "8.4" ]; then IPE_DONT_ENABLE=1 install-php-extensions ${php_install_extensions}; fi
     adduser -H -D -S -G wheel -u 501 machost

From 13002ce0482a1b632892a50ae7d6b37ff07c0030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arne=20J=C3=B8rgensen?= <arne@arnested.dk>
Date: Thu, 12 Dec 2024 14:53:11 +0100
Subject: [PATCH 3/4] PHP 8.0 is no longer supported

---
 Dockerfile | 1 -
 README.md  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a82b019..0a93ea5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,6 @@
 ARG php="8.2"
 
 ## Base PHP images
-FROM php:8.0-fpm-alpine@sha256:bbf76d84a693fae1e0d2a259db70c9c47f41bd5a6ec3d339ba397939e7875dd8 AS php8.0
 FROM php:8.1-fpm-alpine@sha256:2c43b8bd86bd92783b699b711b9bff3b4e327fbf7ad54596421e34ba92637302 AS php8.1
 FROM php:8.2-fpm-alpine@sha256:c523472426f614a75900f6078825db8e43dac2b7b3eba2bbe979b794014a944d AS php8.2
 FROM php:8.3-fpm-alpine@sha256:f629de30ba229744bf7a4019e146940cda8a50808f1c3fd0d05ddc72908ab71b AS php8.3
diff --git a/README.md b/README.md
index e3c76b3..945c4ec 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ services:
 
 ## PHP versions
 
-We provide PHP 8.0, 8.1, 8.2, 8.3 and 8.4 images.
+We provide PHP 8.1, 8.2, 8.3 and 8.4 images.
 
 The images are based on the official [`php:8.x-fpm-alpine` Docker
 images](https://hub.docker.com/_/php). We build new images when new

From 44cdd38d06df41190f1454e52293506c9a0faa94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arne=20J=C3=B8rgensen?= <arne@arnested.dk>
Date: Fri, 13 Dec 2024 07:49:57 +0100
Subject: [PATCH 4/4] Update PHP Docker image SHAs

---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0a93ea5..e38ef44 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
 ARG php="8.2"
 
 ## Base PHP images
-FROM php:8.1-fpm-alpine@sha256:2c43b8bd86bd92783b699b711b9bff3b4e327fbf7ad54596421e34ba92637302 AS php8.1
-FROM php:8.2-fpm-alpine@sha256:c523472426f614a75900f6078825db8e43dac2b7b3eba2bbe979b794014a944d AS php8.2
-FROM php:8.3-fpm-alpine@sha256:f629de30ba229744bf7a4019e146940cda8a50808f1c3fd0d05ddc72908ab71b AS php8.3
-FROM php:8.4-fpm-alpine@sha256:27ec40542bee352cb92da944c8598211bf40a8fd6af8006bf90d39c91672fc0a AS php8.4
+FROM php:8.1-fpm-alpine@sha256:857e617d937d7425433a3e194594147c4553af6aeffb6d58192d1e2f78f04e8d AS php8.1
+FROM php:8.2-fpm-alpine@sha256:2e4805627ecfd6bc83037b0cfd9c89f834d5a57e68da1e3bc52727600fda9f07 AS php8.2
+FROM php:8.3-fpm-alpine@sha256:e33c5c3be36c66846266d71475f47f88cf3ce05361ad2e2f5687ff8220436b2a AS php8.3
+FROM php:8.4-fpm-alpine@sha256:dcbcd25f19919d0d80eff895322d8f8d75f0aa75ff21f906e3da11a63bd74fb3 AS php8.4
 
 ## Helper images
 FROM blackfire/blackfire:2@sha256:1df0d05684ae180dc37a139d8bf01485fdbc37f654ef91ccbdb8072172110daa AS blackfire