Merge pull request #412 from zmiklank/update_bap

update build-and-push action to v4
sclorg · Jun 20, 2023 · a8d2514 · a8d2514
2 parents b9f3217 + 35aefc5
commit a8d2514
Showing 1 changed file with 22 additions and 17 deletions.
diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
@@ -14,50 +14,55 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - dockerfile: "Dockerfile"
-            dockerfile_path: "7.3"
+          - dockerfile: "7.3/Dockerfile"
+            docker_context: "7.3"
             registry_namespace: "centos7"
             quayio_username: "QUAY_IMAGE_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_BUILDER_TOKEN"
             tag: "centos7"
-            suffix: "centos7"
-          - dockerfile: "Dockerfile"
-            dockerfile_path: "7.4"
+            image_name: "php-73-centos7"
+
+          - dockerfile: "7.4/Dockerfile"
+            docker_context: "7.4"
             registry_namespace: "centos7"
             quayio_username: "QUAY_IMAGE_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_BUILDER_TOKEN"
             tag: "centos7"
-            suffix: "centos7"
-          - dockerfile: "Dockerfile.c9s"
-            dockerfile_path: "7.4"
+            image_name: "php-74-centos7"
+
+          - dockerfile: "7.4/Dockerfile.c9s"
+            docker_context: "7.4"
             registry_namespace: "sclorg"
             quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
             tag: "c9s"
-            suffix: "c9s"
-          - dockerfile: "Dockerfile.fedora"
-            dockerfile_path: "8.0"
+            image_name: "php-74-c9s"
+
+          - dockerfile: "8.0/Dockerfile.fedora"
+            docker_context: "8.0"
             registry_namespace: "fedora"
             quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN"
             tag: "8.0"
-          - dockerfile: "Dockerfile.fedora"
-            dockerfile_path: "8.1"
+            image_name: "php-80"
+
+          - dockerfile: "8.1/Dockerfile.fedora"
+            docker_context: "8.1"
             registry_namespace: "fedora"
             quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN"
             tag: "8.1"
+            image_name: "php-81"
 
     steps:
       - name: Build and push to quay.io registry
-        uses: sclorg/build-and-push-action@v2
+        uses: sclorg/build-and-push-action@v4
         with:
           registry: "quay.io"
           registry_namespace: ${{ matrix.registry_namespace }}
           registry_username: ${{ secrets[matrix.quayio_username] }}
           registry_token: ${{ secrets[matrix.quayio_token] }}
           dockerfile: ${{ matrix.dockerfile }}
-          docker_context: ${{ matrix.dockerfile_path }}
-          dockerfile_path: ${{ matrix.dockerfile_path }}
+          docker_context: ${{ matrix.docker_context }}
           tag: ${{ matrix.tag }}
-          suffix: ${{ matrix.suffix }}
+          image_name: ${{ matrix.image_name }}