Merge pull request #434 from zmiklank/use_new_build_and_push

use composite build-and-push-action

Author: zmiklank

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

@@ -3,133 +3,58 @@ on:
   push:
     branches:
       - master
+  schedule:
+      - cron: '0 1 * * 3'
 
 jobs:
   build-and-push:
+    if: github.repository_owner == 'sclorg'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         include:
-          - version: "9.6"
+          - dockerfile_path: "10"
             dockerfile: "Dockerfile"
             registry_namespace: "centos7"
             tag: "centos7"
-          - version: "10"
+            quayio_username: "QUAY_IMAGE_BUILDER_USERNAME"
+            quayio_token: "QUAY_IMAGE_BUILDER_TOKEN"
+          - dockerfile_path: "11"
             dockerfile: "Dockerfile"
             registry_namespace: "centos7"
             tag: "centos7"
-          - version: "11"
+            quayio_username: "QUAY_IMAGE_BUILDER_USERNAME"
+            quayio_token: "QUAY_IMAGE_BUILDER_TOKEN"
+          - dockerfile_path: "12"
             dockerfile: "Dockerfile"
             registry_namespace: "centos7"
             tag: "centos7"
-          - version: "12"
+            quayio_username: "QUAY_IMAGE_BUILDER_USERNAME"
+            quayio_token: "QUAY_IMAGE_BUILDER_TOKEN"
+          - dockerfile_path: "13"
             dockerfile: "Dockerfile"
             registry_namespace: "centos7"
             tag: "centos7"
-          - version: "13"
-            dockerfile: "Dockerfile"
-            registry_namespace: "centos7"
-            tag: "centos7"
-          - version: "13"
+            quayio_username: "QUAY_IMAGE_BUILDER_USERNAME"
+            quayio_token: "QUAY_IMAGE_BUILDER_TOKEN"
+          - dockerfile_path: "13"
             dockerfile: "Dockerfile.c9s"
             registry_namespace: "sclorg"
             tag: "c9s"
+            quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
+            quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
 
     steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-          submodules: true
-
-      - name: Get base image name
-        id: base-image-name
-        run: |
-          # This command returns row with BASE_IMAGE_NAME
-          row=$(grep "BASE_IMAGE_NAME" Makefile)
-          # Return only base image name
-          BASE_IMAGE_ROW=${row/BASE_IMAGE_NAME = /}
-          echo ::set-output name=image_name::$BASE_IMAGE_ROW
-
-      - name: Install python3 packages needed by distgen
-        run: |
-          sudo apt-get update -y && sudo apt-get install -y python3 python3-pip
-
-      - name: Install dist-gen package from PyPi
-        id: dist-gen-install
-        run: |
-          pip3 -v install distgen
-
-      - name: Get short version
-        id: short_version
-        run: |
-          ver="${{ matrix.version }}"
-          echo "::set-output name=SHORT_VER::${ver//./}"
-
-      - name: Generate source by dist-gen
-        id: generate
-        run: |
-          DG=$HOME/.local/bin/dg make generate-all
-
-      - name: Login to Quay.io private registry
-        if: ${{ matrix.tag == 'c9s' }}
-        uses: redhat-actions/podman-login@v1
-        with:
-          registry: quay.io
-          username: ${{ secrets.QUAY_IMAGE_SCLORG_BUILDER_USERNAME }}
-          password: ${{ secrets.QUAY_IMAGE_SCLORG_BUILDER_TOKEN }}
-
-      - name: Check if ${{ matrix.dockerfile }} is present in version directory
-        id: check_dockerfile_file
-        # https://github.com/marketplace/actions/file-existence
-        uses: andstor/file-existence-action@v1
-        with:
-          files: "${{ matrix.version }}/${{ matrix.dockerfile }}"
-
-      - name: Check if .exclude-${{ matrix.tag }} is present in version directory
-        id: check_exclude_file
-        # https://github.com/marketplace/actions/file-existence
-        uses: andstor/file-existence-action@v1
+      - name: Build and push to quay.io registry
+        uses: sclorg/build-and-push-action@v1
         with:
-          files: "${{ matrix.version }}/.exclude-${{ matrix.tag }}"
-
-      - name: Build image
-        if: steps.check_exclude_file.outputs.files_exists == 'false' && steps.check_dockerfile_file.outputs.files_exists == 'true'
-        id: build-image
-        # https://github.com/marketplace/actions/buildah-build
-        uses: redhat-actions/buildah-build@v2
-        with:
-          dockerfiles: ${{ matrix.version }}/${{ matrix.dockerfile }}
-          image: ${{ steps.base-image-name.outputs.image_name}}-${{ steps.short_version.outputs.SHORT_VER }}-${{ matrix.tag }}
-          context: ${{ matrix.version }}
-          tags: latest ${{ matrix.tag }} ${{ github.sha }}
-
-      - name: Push CentOS 7 image to Quay.io
-        if: ${{ steps.check_exclude_file.outputs.files_exists == 'false' && steps.check_dockerfile_file.outputs.files_exists == 'true' && matrix.tag == 'centos7' }}
-        id: push-to-quay-centos7
-        uses: redhat-actions/[email protected]
-        with:
-          image: ${{ steps.build-image.outputs.image }}
-          tags: ${{ steps.build-image.outputs.tags }}
-          registry: quay.io/${{ matrix.registry_namespace }}
-          username: ${{ secrets.QUAY_IMAGE_BUILDER_USERNAME }}
-          password: ${{ secrets.QUAY_IMAGE_BUILDER_TOKEN }}
-
-      - name: Push CentOS Stream 9 image to Quay.io
-        if: ${{ steps.check_exclude_file.outputs.files_exists == 'false' && steps.check_dockerfile_file.outputs.files_exists == 'true' && matrix.tag == 'c9s' }}
-        id: push-to-quay-sclorg
-        uses: redhat-actions/[email protected]
-        with:
-          image: ${{ steps.build-image.outputs.image }}
-          tags: ${{ steps.build-image.outputs.tags }}
-          registry: quay.io/${{ matrix.registry_namespace }}
-          username: ${{ secrets.QUAY_IMAGE_SCLORG_BUILDER_USERNAME }}
-          password: ${{ secrets.QUAY_IMAGE_SCLORG_BUILDER_TOKEN }}
-
-      - name: Print image url
-        if: ${{ matrix.tag == 'centos7' }}
-        run: echo "Image pushed to ${{ steps.push-to-quay-centos7.outputs.registry-paths }}"
-
-      - name: Print image url
-        if: ${{ matrix.tag == 'c9s' }}
-        run: echo "Image pushed to ${{ steps.push-to-quay-sclorg.outputs.registry-paths }}"
+          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 }}
+          tag: ${{ matrix.tag }}
+          use_distgen: "true"