Merge pull request #34 from jkaninda/develop

fix ci
jkaninda · Nov 16, 2024 · a73dc86 · a73dc86
2 parents 2e77ee7 + 9ca7e34
commit a73dc86
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 12 deletions.
diff --git 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
@@ -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"
+           "${{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"