From b80aee1f6881fca7ee9a1970632379ca8c7200f4 Mon Sep 17 00:00:00 2001
From: Niko Kurtti <niko@kurtti.eu>
Date: Sat, 11 May 2024 12:51:22 +0300
Subject: [PATCH] baseimage

---
 .github/workflows/build-images-from-branch.yml | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build-images-from-branch.yml b/.github/workflows/build-images-from-branch.yml
index bfbaf35ffb5..7bb8820e4c2 100644
--- a/.github/workflows/build-images-from-branch.yml
+++ b/.github/workflows/build-images-from-branch.yml
@@ -76,14 +76,11 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-
       - name: Build and push
         uses: docker/build-push-action@v5
         if: matrix.service != 'dashboards'
@@ -93,16 +90,11 @@ jobs:
             VERSION=${{ needs.base.outputs.branch }}
           push: true
           context: .
-          tags: 'opencrvs/ocrvs-${{ matrix.service }}:${{ needs.base.outputs.version }}'
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          sparse-checkout: |
-            trivy.yaml
-            .trivyignore.yaml
-          sparse-checkout-cone-mode: false
+          tags: |
+            'opencrvs/ocrvs-${{ matrix.service }}:${{ needs.base.outputs.version }}'
+            'opencrvs/ocrvs-${{ matrix.service }}:${{ needs.base.outputs.branch }}'
+          cache-from: type=registry,ref=opencrvs/ocrvs-${{ matrix.service }}:${{ needs.base.outputs.branch }}
+          cache-to: type=inline
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master
         if: matrix.service != 'dashboards'