From 9ca7e34b9d38d334532872ff24a09ed0d6a665eb Mon Sep 17 00:00:00 2001
From: Jonas Kaninda <me@jonaskaninda.com>
Date: Sat, 16 Nov 2024 20:47:59 +0100
Subject: [PATCH] fix ci

---
 .github/workflows/build.yml        | 10 +++++-----
 .github/workflows/manual-build.yml | 31 +++++++++++++++++++++++-------
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cf1b57a..6a3c81a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           build-args: |
             phpVersion=8.1
-          tags: "${{ env.BUILDKIT_IMAGE }}:8.1"
+          tags: "${{ vars.BUILDKIT_IMAGE }}:8.1"
       -
         name: Build and push 8.2
         uses: docker/build-push-action@v3
@@ -38,7 +38,7 @@ jobs:
           platforms: linux/amd64,linux/arm64
           build-args: |
             phpVersion=8.2
-          tags: "${{env.BUILDKIT_IMAGE}}:8.2"
+          tags: "${{vars.BUILDKIT_IMAGE}}:8.2"
       -
         name: Build and push 8.3
         uses: docker/build-push-action@v3
@@ -49,8 +49,8 @@ jobs:
           build-args: |
             phpVersion=8.3
           tags: |
-           "${{env.BUILDKIT_IMAGE}}:8.3"
-           "${{env.BUILDKIT_IMAGE}}:latest"
+           "${{vars.BUILDKIT_IMAGE}}:8.3"
+           "${{vars.BUILDKIT_IMAGE}}:latest"
       -
         name: Build and push 8.4 RC
         uses: docker/build-push-action@v3
@@ -61,4 +61,4 @@ jobs:
           build-args: |
             phpVersion=8.4.0RC4
           tags: |
-           "${{env.BUILDKIT_IMAGE}}:8.4.0RC4"
+           "${{vars.BUILDKIT_IMAGE}}:8.4.0RC4"
diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml
index b45105a..0610d60 100644
--- a/.github/workflows/manual-build.yml
+++ b/.github/workflows/manual-build.yml
@@ -59,25 +59,42 @@ jobs:
         name: Build and push 8.1
         uses: docker/build-push-action@v3
         with:
-          file: "./src/docker/8.1/Dockerfile"
+          file: "./src/docker/Dockerfile"
           push: true
           platforms: linux/amd64,linux/arm64
-          tags: "${{env.BUILDKIT_IMAGE}}:8.1"
+          build-args: |
+            phpVersion=8.1
+          tags: "${{ vars.BUILDKIT_IMAGE }}:8.1"
       -
         name: Build and push 8.2
         uses: docker/build-push-action@v3
         with:
-          file: "./src/docker/8.2/Dockerfile"
+          file: "./src/docker/Dockerfile"
           push: true
           platforms: linux/amd64,linux/arm64
-          tags: "${{env.BUILDKIT_IMAGE}}:8.2"
+          build-args: |
+            phpVersion=8.2
+          tags: "${{vars.BUILDKIT_IMAGE}}:8.2"
       -
         name: Build and push 8.3
         uses: docker/build-push-action@v3
         with:
-          file: "./src/docker/8.3/Dockerfile"
+          file: "./src/docker/Dockerfile"
           push: true
           platforms: linux/amd64,linux/arm64
+          build-args: |
+            phpVersion=8.3
           tags: |
-           "${{env.BUILDKIT_IMAGE}}:8.3"
-           "${{env.BUILDKIT_IMAGE}}:latest"
\ No newline at end of file
+           "${{vars.BUILDKIT_IMAGE}}:8.3"
+           "${{vars.BUILDKIT_IMAGE}}:latest"
+      -
+        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"      
\ No newline at end of file