Merge pull request #82 from jkaninda/develop

Add PHP 8.4
jkaninda · Nov 24, 2024 · 5d2b1f2 · 5d2b1f2
2 parents d4f8c74 + d7dad30
commit 5d2b1f2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -70,7 +70,6 @@ jobs:
             phpVersion=8.3
           tags: |
            "${{vars.BUILDKIT_IMAGE}}:8.3"
-           "${{vars.BUILDKIT_IMAGE}}:latest"
       -
         name: Build and push 8.3 alpine
         uses: docker/build-push-action@v3
@@ -83,24 +82,26 @@ jobs:
           tags: |
            "${{vars.BUILDKIT_IMAGE}}:8.3-alpine"
       -
-        name: Build and push 8.4 RC
-        uses: docker/build-push-action@v3
-        with:
-          file: "./src/docker/Dockerfile"
-          push: true
-          platforms: linux/amd64,linux/arm64
-          build-args: |
-            phpVersion=8.4.0RC4
-          tags: |
-           "${{vars.BUILDKIT_IMAGE}}:8.4.0RC4"
+       name: Build and push 8.4 alpine
+       uses: docker/build-push-action@v3
+       with:
+         file: "./src/docker/Dockerfile.alpine"
+         push: true
+         platforms: linux/amd64,linux/arm64
+         build-args: |
+           phpVersion=8.4
+         tags: |
+          "${{vars.BUILDKIT_IMAGE}}:8.4-alpine"
       -
-        name: Build and push 8.4 RC alpine
+        name: Build and push 8.4
         uses: docker/build-push-action@v3
         with:
-          file: "./src/docker/Dockerfile.alpine"
+          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-alpine"
+           "${{vars.BUILDKIT_IMAGE}}:8.4"
+           "${{vars.BUILDKIT_IMAGE}}:latest"
+
diff --git a/Makefile b/Makefile
@@ -18,10 +18,10 @@ 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 .
 .PHONY: build-81-alpine
 build-81-alpine:
 	 docker build --build-arg phpVersion=8.1 -f src/docker/Dockerfile.alpine -t ${IMAGE_NAME}:8.1-alpine .
 .PHONY: build-84-alpine
 build-84-alpine:
-	 docker build --build-arg phpVersion=8.4.0RC4 -f src/docker/Dockerfile.alpine -t ${IMAGE_NAME}:8.4.0RC4-alpine .
+	 docker build --build-arg phpVersion=8.4 -f src/docker/Dockerfile.alpine -t ${IMAGE_NAME}:8.4-alpine .
diff --git a/README.md b/README.md
@@ -20,6 +20,7 @@
 
 
 ## PHP Version:
+- 8.4
 - 8.3
 - 8.2
 - 8.1
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,7 @@ @@
     ## PHP Version:
+    - 8.4
     - 8.3
     - 8.2
     - 8.1
@@ Expand Down @@