From c87b595f66de6407ed525b9a580c586aa7a1e93a Mon Sep 17 00:00:00 2001
From: Jesse Bannon <jbann1994@gmail.com>
Date: Wed, 15 Mar 2023 14:59:52 -0700
Subject: [PATCH] [DOCKER] Properly tag ubuntu image (#546)

* [DOCKER] Properly tag ubuntu image

* unique keys
---
 .github/workflows/package-ubuntu.yaml | 11 ++++++-----
 .github/workflows/package.yaml        |  9 +++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/package-ubuntu.yaml b/.github/workflows/package-ubuntu.yaml
index 7f2e746b..6a8bc2f4 100644
--- a/.github/workflows/package-ubuntu.yaml
+++ b/.github/workflows/package-ubuntu.yaml
@@ -89,7 +89,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /tmp/build-cache/arm64
-          key: ${{github.sha}}
+          key: ${{github.sha}}-arm64
 
 
   # Build AMD64 container
@@ -133,7 +133,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /tmp/build-cache/amd64
-          key: ${{github.sha}}
+          key: ${{github.sha}}-amd64
 
 
   # On master branch, build the docker manifest file from the cached
@@ -141,6 +141,7 @@ jobs:
   deploy:
     runs-on: ubuntu-22.04
     needs: [
+      build,
       package-arm64,
       package-amd64
     ]
@@ -178,13 +179,13 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /tmp/build-cache/arm64
-          key: ${{github.sha}}
+          key: ${{github.sha}}-arm64
 
       - name: Restore AMD64 build cache
         uses: actions/cache@v3
         with:
           path: /tmp/build-cache/amd64
-          key: ${{github.sha}}
+          key: ${{github.sha}}-amd64
 
       - name: Format image_id
         id: formatted-image_id
@@ -216,7 +217,7 @@ jobs:
           --platform=linux/amd64,linux/arm64 \
           --cache-from=type=local,src=/tmp/build-cache/amd64 \
           --cache-from=type=local,src=/tmp/build-cache/arm64 \
-          --tag ubuntu-${{ steps.formatted-image_id.outputs.IMAGE_ID }}:ubuntu-${{ steps.formatted_version.outputs.VERSION }} \
+          --tag ${{ steps.formatted-image_id.outputs.IMAGE_ID }}:ubuntu-${{ steps.formatted_version.outputs.VERSION }} \
           --label "runnumber=ubuntu-${GITHUB_RUN_ID}" \
           --file docker/Dockerfile.ubuntu \
           docker/
\ No newline at end of file
diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml
index de6ef87a..835b75f2 100644
--- a/.github/workflows/package.yaml
+++ b/.github/workflows/package.yaml
@@ -88,7 +88,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /tmp/build-cache/arm64
-          key: ${{github.sha}}
+          key: ${{github.sha}}-arm64
 
 
   # Build AMD64 container
@@ -131,7 +131,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /tmp/build-cache/amd64
-          key: ${{github.sha}}
+          key: ${{github.sha}}-amd64
 
 
   # On master branch, build the docker manifest file from the cached
@@ -139,6 +139,7 @@ jobs:
   deploy:
     runs-on: ubuntu-22.04
     needs: [
+      build,
       package-arm64,
       package-amd64
     ]
@@ -176,13 +177,13 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /tmp/build-cache/arm64
-          key: ${{github.sha}}
+          key: ${{github.sha}}-arm64
 
       - name: Restore AMD64 build cache
         uses: actions/cache@v3
         with:
           path: /tmp/build-cache/amd64
-          key: ${{github.sha}}
+          key: ${{github.sha}}-amd64
 
       - name: Format image_id
         id: formatted-image_id