From 6a73fa95248397dcb065e6a702aaa50e148a6ec8 Mon Sep 17 00:00:00 2001
From: Kenneth Bingham <kenneth.bingham@netfoundry.io>
Date: Tue, 4 Apr 2023 14:05:08 -0400
Subject: [PATCH 1/2] add release candidate container image

---
 .github/workflows/ci-build.yml | 63 +++++++++++++++++++++++++++++++++-
 1 file changed, 62 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 9cdb81ba..27194288 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -12,6 +12,7 @@ on:
 
 jobs:
   ubuntu-build:
+    name: Build Linux AMD64 CLI
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
@@ -51,4 +52,64 @@ jobs:
         with:
           name: linux-amd64
           path: ${{ steps.solve_go_bin.outputs.go_bin }}/zrok
-          if-no-files-found: error
\ No newline at end of file
+          if-no-files-found: error
+  # build a release candidate container image for branches named "main" or like "v*"
+  rc-container-build:
+    needs: ubuntu-build
+    if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/v')
+    name: Build Release Candidate Container Image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set a container image tag from the branch name
+        id: slug
+        run: |
+          echo branch_tag=$(sed 's/[^a-z0-9_-]/__/gi' <<< "${GITHUB_REF#refs/heads/}") >> $GITHUB_OUTPUT
+
+      - name: Checkout Workspace
+        uses: actions/checkout@v3
+
+      - name: Download Branch Build Artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: linux-amd64
+          path: ./dist/amd64/linux/
+
+      - name: Set Up QEMU
+        uses: docker/setup-qemu-action@v2
+        with:
+          platforms: amd64,arm64
+
+      - name: Set Up Docker BuildKit
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_HUB_API_USER }}
+          password: ${{ secrets.DOCKER_HUB_API_TOKEN }}
+
+      - name: Set Up Container Image Tags for zrok CLI Container
+        env:
+          # RELEASE_REPO: openziti/zrok
+          RELEASE_REPO: kbinghamnetfoundry/zrok
+          ZROK_VERSION: ${{ steps.slug.outputs.branch_tag }}
+        id: tagprep_cli
+        run: |
+          DOCKER_TAGS=""
+          DOCKER_TAGS="${RELEASE_REPO}:${ZROK_VERSION}"
+          echo "DEBUG: DOCKER_TAGS=${DOCKER_TAGS}"
+          echo DOCKER_TAGS="${DOCKER_TAGS}" >> $GITHUB_OUTPUT
+
+      - name: Build & Push Linux AMD64 CLI Container Image to Hub
+        uses: docker/build-push-action@v3
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          context: ${{ github.workspace }}/
+          file: ${{ github.workspace }}/docker/images/zrok/Dockerfile
+          platforms: linux/amd64
+          tags: ${{ steps.tagprep_cli.outputs.DOCKER_TAGS }}
+          build-args: |
+            DOCKER_BUILD_DIR=./docker/images/zrok
+            ARTIFACTS_DIR=./dist
+          push: true

From 9ca8629bf63d84df26774632931452dccdd07846 Mon Sep 17 00:00:00 2001
From: Kenneth Bingham <kenneth.bingham@netfoundry.io>
Date: Tue, 4 Apr 2023 14:52:59 -0400
Subject: [PATCH 2/2] finish cleaning up test image registry repo name

---
 .github/workflows/ci-build.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 27194288..0d49ef0a 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -91,8 +91,7 @@ jobs:
 
       - name: Set Up Container Image Tags for zrok CLI Container
         env:
-          # RELEASE_REPO: openziti/zrok
-          RELEASE_REPO: kbinghamnetfoundry/zrok
+          RELEASE_REPO: openziti/zrok
           ZROK_VERSION: ${{ steps.slug.outputs.branch_tag }}
         id: tagprep_cli
         run: |