From a74215f654950c381778ebc712659ad533d70688 Mon Sep 17 00:00:00 2001
From: Chris Ayers <clayers@gmail.com>
Date: Wed, 14 Feb 2024 06:10:43 +0000
Subject: [PATCH] Refactor Docker image build and push workflow

---
 .github/workflows/docker-image.yml | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index ee42bfb..9509572 100755
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -52,26 +52,37 @@ jobs:
 
       - name: Build Docker Image
         uses: docker/build-push-action@v5
-        id: build-and-push
+        id: build
         with:
           context: src/SampleApi
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
+          push: false
+          tags: ${{ env.IMAGE_NAME }}:${{ env.TAG }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
+  
       - name: Run Trivy vulnerability scanner
         if: ${{ github.event_name != 'pull_request' }}
         uses: aquasecurity/trivy-action@master
         with:
-          image-ref: ${{ fromJSON(steps.build-and-push.outputs.metadata)['image.name'] }}
+          image-ref: ${{ fromJSON(steps.build.outputs.metadata)['image.name'] }}
           format: 'github'
           github-pat: ${{ github.token }}
         env:
           TRIVY_USERNAME: Username
           TRIVY_PASSWORD: Password
 
-      # Sign the resulting Docker image digest except on PRs.
+      - name: Build Docker Image
+        uses: docker/build-push-action@v5
+        id: build-and-push
+        with:
+          context: src/SampleApi
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+        # Sign the resulting Docker image digest except on PRs.
       # This will only write to the public Rekor transparency log when the Docker
       # repository is public to avoid leaking data.  If you would like to publish
       # transparency data even for private images, pass --force to cosign below.