.gitea/workflows/almalinux8.yaml

@@ -22,16 +22,6 @@ jobs:
           microdnf -y install git nodejs buildah podman
       - name: Check out repository code
         uses: actions/checkout@v4
-      - name: Login to quay.io
-        uses: docker/login-action@v3
-        with:
-          registry: quay.io
-          username: ${{ vars.QUAY_USERNAME }}
-          password: ${{ secrets.QUAY_SECRET }}
-      # - name: Set up QEMU
-      #   uses: docker/setup-qemu-action@v3
-      - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v3
       - if: ${{ matrix.flavor == 'default' }}
         name: Build almalinux default image
         uses: redhat-actions/buildah-build@v2
@@ -43,18 +33,14 @@ jobs:
             ALMALINUX_VERSION=${{ matrix.version }}
           tags: |
             quay.io/sindigilive/almalinux:${{ matrix.version }}
-      - if: ${{ matrix.flavor == 'micro' }} 
+      - if: ${{ matrix.flavor == 'default' }}
-        name: Build and push almalinux flavor
+        name: Push To quay.io
-        uses: docker/build-push-action@v5
+        uses: redhat-actions/push-to-registry@v2
         with:
-          # platforms: linux/amd64,linux/arm64
+          tags: quay.io/sindigilive/almalinux:${{ matrix.version }}
-          push: true
+          registry: quay.io
-          context: .
+          username: ${{ vars.QUAY_USERNAME }}
-          file: ./8/Dockerfile.${{ matrix.flavor }}
+          password: ${{ secrets.QUAY_SECRET }}
-          build-args: |
-            ALMALINUX_VERSION=${{ matrix.version }}
-          tags: |
-            quay.io/sindigilive/almalinux:${{ matrix.version }}-${{ matrix.flavor }}
       - if: ${{ matrix.flavor == 'default' }}
         name: Scan almalinux image with Trivy
         uses: aquasecurity/trivy-action@0.20.0
@@ -103,26 +89,16 @@ jobs:
           microdnf -y install git nodejs buildah podman
       - name: Check out repository code
         uses: actions/checkout@v4
-      - name: Login to quay.io
+      - name: Build and push latest almalinux8-micro
-        uses: docker/login-action@v3
+        uses: redhat-actions/buildah-build@v2
-        with:
-          registry: quay.io
-          username: ${{ vars.QUAY_USERNAME }}
-          password: ${{ secrets.QUAY_SECRET }}
-      # - name: Set up QEMU
-      #   uses: docker/setup-qemu-action@v3
-      - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Build and push latest almalinux9-micro
-        uses: docker/build-push-action@v5
         with:
           context: .
           containerfiles: |
             8/Dockerfile.micro
           tags: |
             quay.io/sindigilive/almalinux:8-micro
-      - name: Build and push latest almalinux9
+      - name: Build and push latest-almalinux8
-        uses: docker/build-push-action@v5
+        uses: redhat-actions/buildah-build@v2
         with:
           context: .
           containerfiles: |
@@ -136,4 +112,5 @@ jobs:
           username: ${{ vars.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_SECRET }}
           tags: |
+            quay.io/sindigilive/almalinux:8-micro
             quay.io/sindigilive/almalinux:8

.gitea/workflows/almalinux9.yaml

@@ -22,19 +22,9 @@ jobs:
           microdnf -y install git nodejs buildah podman
       - name: Check out repository code
         uses: actions/checkout@v4
-      - name: Login to docker.io
+      - if: ${{ matrix.flavor == 'default' }}
-        uses: docker/login-action@v3
+        name: Build almalinux default image
-        with:
+        uses: redhat-actions/buildah-build@v2
-          registry: quay.io
-          username: ${{ vars.QUAY_USERNAME }}
-          password: ${{ secrets.QUAY_SECRET }}
-      # - name: Set up QEMU
-      #   uses: docker/setup-qemu-action@v3
-      - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v3
-      - if: ${{ matrix.flavor  == 'default' }}
-        name: Build and push almalinux
-        uses: docker/build-push-action@v5
         with:
           context: .
           containerfiles: |
@@ -43,18 +33,14 @@ jobs:
             ALMALINUX_VERSION=${{ matrix.version }}
           tags: |
             quay.io/sindigilive/almalinux:${{ matrix.version }}
-      - if: ${{ matrix.flavor == 'micro' }}
+      - if: ${{ matrix.flavor == 'default' }}
-        name: Build and push almalinux
+        name: Push To quay.io
-        uses: docker/build-push-action@v5
+        uses: redhat-actions/push-to-registry@v2
         with:
-          # platforms: linux/amd64,linux/arm64
+          tags: quay.io/sindigilive/almalinux:${{ matrix.version }}
-          push: true
+          registry: quay.io
-          context: .
+          username: ${{ vars.QUAY_USERNAME }}
-          file: ./9/Dockerfile.${{ matrix.flavor }}
+          password: ${{ secrets.QUAY_SECRET }}
-          build-args: |
-            ALMALINUX_VERSION=${{ matrix.version }}
-          tags: |
-            quay.io/sindigilive/almalinux:${{ matrix.version }}-${{ matrix.flavor }}
       - if: ${{ matrix.flavor == 'default' }}
         name: Scan almalinux image with Trivy
         uses: aquasecurity/trivy-action@0.20.0
@@ -103,16 +89,6 @@ jobs:
           microdnf -y install git nodejs buildah podman
       - name: Check out repository code
         uses: actions/checkout@v4
-      - name: Login to docker.io
-        uses: docker/login-action@v3
-        with:
-          registry: quay.io
-          username: ${{ vars.QUAY_USERNAME }}
-          password: ${{ secrets.QUAY_SECRET }}
-      # - name: Set up QEMU
-      #   uses: docker/setup-qemu-action@v3
-      - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v3
       - name: Build and push latest almalinux9-micro
         uses: redhat-actions/buildah-build@v2
         with:
@@ -122,8 +98,8 @@ jobs:
           tags: |
             quay.io/sindigilive/almalinux:9-micro
             quay.io/sindigilive/almalinux:micro
-      - name: Build and push latest almalinux9
+      - name: Build and push latest-almalinux9
-        uses: docker/build-push-action@v5
+        uses: redhat-actions/buildah-build@v2
         with:
           context: .
           containerfiles: |
@@ -138,5 +114,7 @@ jobs:
           username: ${{ vars.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_SECRET }}
           tags: |
+            quay.io/sindigilive/almalinux:9-micro
+            quay.io/sindigilive/almalinux:micro
             quay.io/sindigilive/almalinux:9
             quay.io/sindigilive/almalinux:latest