From aeb6bdb430c7f583bf0a2a6a8fa950874ff701bd Mon Sep 17 00:00:00 2001
From: "l.h. riley" <liam.h.riley@gmail.com>
Date: Thu, 31 Aug 2023 17:41:40 -0700
Subject: [PATCH 1/2] DEVOPS-1626 - Fix bad workflow options

---
 .github/workflows/release-container.yaml | 11 +++++------
 .github/workflows/testing-container.yaml | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/release-container.yaml b/.github/workflows/release-container.yaml
index 28cd4122a..4b70be4bf 100644
--- a/.github/workflows/release-container.yaml
+++ b/.github/workflows/release-container.yaml
@@ -6,6 +6,9 @@ on:
   release:
     types: [published]
 
+env:
+  CONTAINER_IMAGE: "ghcr.io/${{ github.repository }}"
+
 jobs:
   context:
     runs-on: ubuntu-latest
@@ -31,14 +34,10 @@ jobs:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         push: true
 
-        registry: ghcr.io
-        organization: "${{ github.event.repository.owner.login }}"
-        repository: "${{ github.event.repository.name }}"
-
         platforms: |
           linux/amd64
           linux/arm64
 
         tags: |
-          latest
-          ${{ github.event.release.tag_name }}
+          ${{ env.CONTAINER_IMAGE }}:latest
+          ${{ env.CONTAINER_IMAGE }}:${{ github.event.release.tag_name }}
diff --git a/.github/workflows/testing-container.yaml b/.github/workflows/testing-container.yaml
index 6d43f996a..626050a18 100644
--- a/.github/workflows/testing-container.yaml
+++ b/.github/workflows/testing-container.yaml
@@ -7,6 +7,9 @@ on:
     branches:
       - 'develop'
 
+env:
+  CONTAINER_IMAGE: "ghcr.io/${{ github.repository }}"
+
 jobs:
   context:
     runs-on: ubuntu-latest
@@ -32,14 +35,10 @@ jobs:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         push: true
 
-        registry: ghcr.io
-        organization: "${{ github.event.repository.owner.login }}"
-        repository: "${{ github.event.repository.name }}"
-
         platforms: |
           linux/amd64
           linux/arm64
 
         tags: |
-          develop
-          ${{ github.sha }}
+          ${{ env.CONTAINER_IMAGE }}:develop
+          ${{ env.CONTAINER_IMAGE }}:${{ github.sha }}

From 4609118d36a97a9859ff677459959b62476f29dc Mon Sep 17 00:00:00 2001
From: "l.h. riley" <liam.h.riley@gmail.com>
Date: Thu, 31 Aug 2023 17:49:05 -0700
Subject: [PATCH 2/2] DEVOPS-1626 - container names must be lowercase

---
 .github/workflows/release-container.yaml | 4 ++++
 .github/workflows/testing-container.yaml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/.github/workflows/release-container.yaml b/.github/workflows/release-container.yaml
index 4b70be4bf..4e79c9a93 100644
--- a/.github/workflows/release-container.yaml
+++ b/.github/workflows/release-container.yaml
@@ -18,6 +18,10 @@ jobs:
       packages: write
 
     steps:
+    - name: downcase CONTAINER_IMAGE
+      run: |
+        echo "CONTAINER_IMAGE=${CONTAINER_IMAGE,,}" >> ${GITHUB_ENV}
+
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v2
 
diff --git a/.github/workflows/testing-container.yaml b/.github/workflows/testing-container.yaml
index 626050a18..6e6920501 100644
--- a/.github/workflows/testing-container.yaml
+++ b/.github/workflows/testing-container.yaml
@@ -19,6 +19,10 @@ jobs:
       packages: write
 
     steps:
+    - name: downcase CONTAINER_IMAGE
+      run: |
+        echo "CONTAINER_IMAGE=${CONTAINER_IMAGE,,}" >> ${GITHUB_ENV}
+
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v2