From 3b5b0891e1af86435235e83e489dfc0e3f08b620 Mon Sep 17 00:00:00 2001
From: KevFan <chfan@redhat.com>
Date: Fri, 13 Oct 2023 12:38:11 +0100
Subject: [PATCH] test: docker buildx

---
 .github/workflows/build-image.yaml | 98 ++++++++++++++++++++----------
 .github/workflows/e2e.yaml         | 32 +++++++---
 2 files changed, 91 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/build-image.yaml b/.github/workflows/build-image.yaml
index 5150c442..099c78e3 100644
--- a/.github/workflows/build-image.yaml
+++ b/.github/workflows/build-image.yaml
@@ -17,43 +17,77 @@ jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - linux/amd64
+          - linux/arm64
     steps:
       - name: Check out code
         uses: actions/checkout@v4
-      - name: Add latest tag
-        if: ${{ github.ref_name == env.MAIN_BRANCH_NAME }}
-        run: |
-          echo "IMG_TAGS=${{ env.IMG_TAGS }} latest" >> $GITHUB_ENV
-      - name: Add branch name tag
-        if: ${{ github.ref_name != env.MAIN_BRANCH_NAME }}
-        run: |
-          echo "IMG_TAGS=${{ env.IMG_TAGS }} ${{ github.ref_name }}" >> $GITHUB_ENV
+#      - name: Add latest tag
+#        if: ${{ github.ref_name == env.MAIN_BRANCH_NAME }}
+#        run: |
+#          echo "IMG_TAGS=${{ env.IMG_TAGS }} latest" >> $GITHUB_ENV
+#      - name: Add branch name tag
+#        if: ${{ github.ref_name != env.MAIN_BRANCH_NAME }}
+#        run: |
+#          echo "IMG_TAGS=${{ env.IMG_TAGS }} ${{ github.ref_name }}" >> $GITHUB_ENV
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Build Image
-        id: build-image
-        uses: redhat-actions/buildah-build@v2
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
         with:
-          image: limitador
-          tags: ${{ env.IMG_TAGS }}
-          platforms: linux/amd64,linux/arm64
-          dockerfiles: |
-            ./Dockerfile
-          build-args: |
-            GITHUB_SHA=${{ github.sha }}
-      - name: Smoke Test
-        run: |
-          podman run --rm -t ${{ steps.build-image.outputs.image }}:${{ github.sha }} limitador-server --help
-      - name: Push Image
-        if: ${{ !env.ACT }}
-        id: push-to-quay
-        uses: redhat-actions/push-to-registry@v2
+          images: |
+            ${{ env.IMG_REGISTRY_HOST}}/${{ env.IMG_REGISTRY_ORG }}/limitador
+          tags: |
+            # set latest tag for main branch
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
+            type=sha
+      - name: Login to container registry
+        uses: docker/login-action@v2
         with:
-          image: ${{ steps.build-image.outputs.image }}
-          tags: ${{ steps.build-image.outputs.tags }}
-          registry: ${{ env.IMG_REGISTRY_HOST }}/${{ env.IMG_REGISTRY_ORG }}
           username: ${{ secrets.IMG_REGISTRY_USERNAME }}
           password: ${{ secrets.IMG_REGISTRY_TOKEN }}
-      - name: Print Image URL
-        run: |
-          echo "Image pushed to ${{ steps.push-to-quay.outputs.registry-paths }}"
+          registry: ${{ env.IMG_REGISTRY_HOST }}
+      - name: Build and push by digest
+        id: build
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          tags: ${{ steps.meta.outputs.tags }}
+          build-args: |
+            GITHUB_SHA=${{ github.sha }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+#      - name: Build Image
+#        id: build-image
+#        uses: redhat-actions/buildah-build@v2
+#        with:
+#          image: limitador
+#          tags: ${{ env.IMG_TAGS }}
+#          platforms: linux/amd64,linux/arm64
+#          dockerfiles: |
+#            ./Dockerfile
+#          build-args: |
+#            GITHUB_SHA=${{ github.sha }}
+#      - name: Smoke Test
+#        run: |
+#          podman run --rm -t ${{ steps.build-image.outputs.image }}:${{ github.sha }} limitador-server --help
+#      - name: Push Image
+#        if: ${{ !env.ACT }}
+#        id: push-to-quay
+#        uses: redhat-actions/push-to-registry@v2
+#        with:
+#          image: ${{ steps.build-image.outputs.image }}
+#          tags: ${{ steps.build-image.outputs.tags }}
+#          registry: ${{ env.IMG_REGISTRY_HOST }}/${{ env.IMG_REGISTRY_ORG }}
+#          username: ${{ secrets.IMG_REGISTRY_USERNAME }}
+#          password: ${{ secrets.IMG_REGISTRY_TOKEN }}
+#      - name: Print Image URL
+#        run: |
+#          echo "Image pushed to ${{ steps.push-to-quay.outputs.registry-paths }}"
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 38980222..47f2ee26 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -14,14 +14,32 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v4
-      - name: Build Limitador Image
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            limitador-testing
+          tags: |
+            type=raw,value=latest
+      - name:  Build Limitador Image
         id: build-image
-        uses: redhat-actions/buildah-build@v2
+        uses: docker/build-push-action@v5
         with:
-          image: limitador-testing
-          tags: latest
-          dockerfiles: |
-            ./Dockerfile
+          context: .
+          tags: ${{ steps.meta.outputs.tags }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+#      - name: Build Limitador Image
+#        id: build-image
+#        uses: redhat-actions/buildah-build@v2
+#        with:
+#          image: limitador-testing
+#          tags: latest
+#          dockerfiles: |
+#            ./Dockerfile
       - name: Create k8s Kind Cluster
         uses: helm/kind-action@v1.1.0
         with:
@@ -34,7 +52,7 @@ jobs:
           kubectl cluster-info dump
       - name: Load limitador docker image
         run: |
-          podman save -o image.tar ${{ steps.build-image.outputs.image }}:${{ steps.build-image.outputs.tags }}
+          podman save -o image.tar ${{ steps.meta.outputs.tags }}
           kind load image-archive --name limitador-local image.tar
       - name: Deploy limitador
         run: |