From c8b84dab44336d3540e5f7333ff669eb95ea05f2 Mon Sep 17 00:00:00 2001
From: Jonas Kaninda <me@jonaskaninda.com>
Date: Sat, 16 Nov 2024 21:09:20 +0100
Subject: [PATCH 1/3] Dockerfile: set default argument version to 8.3-dev to
 avoid mistake

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

diff --git a/src/docker/Dockerfile b/src/docker/Dockerfile
index 65f7707..dba39bd 100644
--- a/src/docker/Dockerfile
+++ b/src/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG phpVersion=8.3
+ARG phpVersion=8.3-dev
 FROM php:${phpVersion}-fpm
 ARG WORKDIR=/var/www/html
 ENV DOCUMENT_ROOT=${WORKDIR}

From d40b8ebc07fc3f6e4425c5cc19de479775ae2d0a Mon Sep 17 00:00:00 2001
From: Jonas Kaninda <me@jonaskaninda.com>
Date: Sun, 24 Nov 2024 13:17:06 +0100
Subject: [PATCH 2/3] Add PHP 8.4

---
 .github/workflows/build.yml | 8 ++++----
 Makefile                    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6a3c81a..0c671af 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -50,15 +50,15 @@ jobs:
             phpVersion=8.3
           tags: |
            "${{vars.BUILDKIT_IMAGE}}:8.3"
-           "${{vars.BUILDKIT_IMAGE}}:latest"
       -
-        name: Build and push 8.4 RC
+        name: Build and push 8.4
         uses: docker/build-push-action@v3
         with:
           file: "./src/docker/Dockerfile"
           push: true
           platforms: linux/amd64,linux/arm64
           build-args: |
-            phpVersion=8.4.0RC4
+            phpVersion=8.4
           tags: |
-           "${{vars.BUILDKIT_IMAGE}}:8.4.0RC4"
+           "${{vars.BUILDKIT_IMAGE}}:8.4"
+           "${{vars.BUILDKIT_IMAGE}}:latest"
diff --git a/Makefile b/Makefile
index dc90f0a..478ed80 100644
--- a/Makefile
+++ b/Makefile
@@ -18,4 +18,4 @@ build-83:
 	 docker build --build-arg phpVersion=8.3 -f src/docker/Dockerfile -t ${IMAGE_NAME}:8.3 .
 .PHONY: build-84
 build-84:
-	 docker build --build-arg phpVersion=8.4.0RC4 -f src/docker/Dockerfile -t ${IMAGE_NAME}:8.4 .
+	 docker build --build-arg phpVersion=8.4 -f src/docker/Dockerfile -t ${IMAGE_NAME}:8.4 .

From 6a782c5437433119571e569fe73f26b11ccf1138 Mon Sep 17 00:00:00 2001
From: Jonas Kaninda <me@jonaskaninda.com>
Date: Sun, 24 Nov 2024 13:18:20 +0100
Subject: [PATCH 3/3] Add PHP 8.4

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 1f2d8fe..f8185bf 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,7 @@
 - [Github](https://github.com/jkaninda/nginx-php-fpm)
 
 ## PHP Versions:
+- 8.4
 - 8.3
 - 8.2
 - 8.1