use newest build-and-push action (sclorg#468)

Main change is, that the distgen will no longer be called before build
of the image in the build-and-push action.

Author: zmiklank

.github/workflows/build-and-push.yml

@@ -14,72 +14,72 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - dockerfile_path: "10"
-            dockerfile: "Dockerfile"
+          - dockerfile: "10/Dockerfile"
             registry_namespace: "centos7"
             tag: "centos7"
-            suffix: "centos7"
+            image_name: "postgresql-10-centos7"
             quayio_username: "QUAY_IMAGE_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_BUILDER_TOKEN"
-          - dockerfile_path: "12"
-            dockerfile: "Dockerfile"
+            docker_context: 10
+          - dockerfile: "12/Dockerfile"
             registry_namespace: "centos7"
             tag: "centos7"
-            suffix: "centos7"
+            image_name: "postgresql-12-centos7"
             quayio_username: "QUAY_IMAGE_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_BUILDER_TOKEN"
-          - dockerfile_path: "13"
-            dockerfile: "Dockerfile"
+            docker_context: 12
+          - dockerfile: "13/Dockerfile"
             registry_namespace: "centos7"
             tag: "centos7"
-            suffix: "centos7"
+            image_name: "postgresql-13-centos7"
             quayio_username: "QUAY_IMAGE_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_BUILDER_TOKEN"
-          - dockerfile_path: "13"
-            dockerfile: "Dockerfile.c9s"
+            docker_context: 13
+          - dockerfile: "13/Dockerfile.c9s"
             registry_namespace: "sclorg"
             tag: "c9s"
-            suffix: "c9s"
+            image_name: "postgresql-13-c9s"
             quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
-          - dockerfile_path: "10"
-            dockerfile: "Dockerfile.c8s"
+            docker_context: 13
+          - dockerfile: "10/Dockerfile.c8s"
             registry_namespace: "sclorg"
             tag: "c8s"
-            suffix: "c8s"
             quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
-          - dockerfile_path: "13"
-            dockerfile: "Dockerfile.c8s"
+            image_name: "postgresql-10-c8s"
+            docker_context: 10
+          - dockerfile: "13/Dockerfile.c8s"
             registry_namespace: "sclorg"
             tag: "c8s"
-            suffix: "c8s"
             quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
-          - dockerfile_path: "12"
-            dockerfile: "Dockerfile.fedora"
+            image_name: "postgresql-13-c8s"
+            docker_context: 13
+          - dockerfile: "12/Dockerfile.fedora"
             registry_namespace: "fedora"
             tag: "12"
             quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN"
-          - dockerfile_path: "13"
-            dockerfile: "Dockerfile.fedora"
+            image_name: "postgresql-12"
+            docker_context: 12
+          - dockerfile: "13/Dockerfile.fedora"
             registry_namespace: "fedora"
             tag: "13"
             quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN"
+            image_name: "postgresql-13"
+            docker_context: 13
 
     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 }}
-          use_distgen: "true"
-          suffix: ${{ matrix.suffix }}
+          image_name: ${{ matrix.image_name }}