From 508d83ccd380c914a87a72eac3a404a3d2f13ed0 Mon Sep 17 00:00:00 2001
From: Gordon Smith <GordonJSmith@gmail.com>
Date: Fri, 28 Jul 2023 08:46:44 +0100
Subject: [PATCH] HPCC-29997 Fix LN K8s had invalid label for JFrog

Refactor image labels to simplify further changes.

Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
---
 .github/workflows/build-assets.yml | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build-assets.yml b/.github/workflows/build-assets.yml
index 9b5811b8d38..1dfec0b54a8 100644
--- a/.github/workflows/build-assets.yml
+++ b/.github/workflows/build-assets.yml
@@ -146,14 +146,6 @@ jobs:
           echo "docker_build_label=$docker_build_label" >> $GITHUB_OUTPUT
           echo "docker_tag=$docker_build_label:$vcpkg_sha_short" >> $GITHUB_OUTPUT
           echo "docker_tag_candidate_base=$docker_build_label:${{ needs.preamble.outputs.candidate_base_branch }}" >> $GITHUB_OUTPUT
-          echo "docker_tag_candidate=$docker_build_label:${{ needs.preamble.outputs.candidate_branch }}" >> $GITHUB_OUTPUT
-          docker_community_label=hpccsystems/platform-core-${{ matrix.os }}
-          echo "docker_tag_community_base=$docker_community_label:${{ needs.preamble.outputs.candidate_base_branch }}" >> $GITHUB_OUTPUT
-          echo "docker_tag_community=$docker_community_label:${{ needs.preamble.outputs.community_tag }}" >> $GITHUB_OUTPUT
-          docker_internal_label=ln/platform-core-${{ matrix.os }}
-          echo "docker_tag_internal_base=$docker_internal_label:${{ needs.preamble.outputs.candidate_base_branch }}" >> $GITHUB_OUTPUT
-          echo "docker_tag_internal=$docker_internal_label:${{ needs.preamble.outputs.internal_tag }}" >> $GITHUB_OUTPUT
-          echo "docker_tag_internal=$docker_core_label:${{ needs.preamble.outputs.internal_tag }}" >> $GITHUB_OUTPUT
 
       - name: Print vars
         run: |
@@ -260,14 +252,14 @@ jobs:
           build-args: |
             PKG_FILE=${{ steps.container.outputs.k8s_pkg_file }}
           tags: |
-            ${{ steps.vars.outputs.docker_tag_community }}
-            ${{ steps.vars.outputs.docker_tag_community_base }}
+            hpccsystems/platform-core-${{ matrix.os }}:${{ needs.preamble.outputs.community_tag }}
+            hpccsystems/platform-core-${{ matrix.os }}:${{ needs.preamble.outputs.candidate_base_branch }}
           cache-from: |
-            type=registry,ref=${{ steps.vars.outputs.docker_tag_community_base }}
+            type=registry,ref=hpccsystems/platform-core-${{ matrix.os }}:${{ needs.preamble.outputs.candidate_base_branch }}
 
       #  Internal Build  ---
-      - name: Login to JFrog
-        if: ${{ matrix.ln && matrix.container }}
+      - name: Login to JFrog (internal)
+        if: ${{ matrix.ln && matrix.container && github.repository_owner == 'hpcc-systems' }}
         uses: docker/login-action@v2
         with:
           registry: ${{ secrets.JFROG_REGISTRY }}
@@ -335,10 +327,10 @@ jobs:
           build-args: |
             PKG_FILE=${{ steps.ln-container.outputs.k8s_pkg_file }}
           tags: |
-            ${{ secrets.JFROG_REGISTRY }}/${{ steps.vars.outputs.docker_tag_internal }}
-            ${{ secrets.JFROG_REGISTRY }}/${{ steps.vars.outputs.docker_tag_internal_base }}
+            ${{ secrets.JFROG_REGISTRY || 'dummy.io' }}/ln/platform-core-${{ matrix.os }}:${{ needs.preamble.outputs.internal_tag }}
+            ${{ secrets.JFROG_REGISTRY || 'dummy.io' }}/ln/platform-core-${{ matrix.os }}:${{ needs.preamble.outputs.candidate_base_branch }}
           cache-from: |
-            type=registry,ref=${{ steps.vars.outputs.docker_tag_community_base }}
+            type=registry,ref=hpccsystems/platform-core-${{ matrix.os }}:${{ needs.preamble.outputs.candidate_base_branch }}
 
       #  Common  ---
       - name: Cleanup Environment
@@ -462,5 +454,5 @@ jobs:
         if: ${{ failure() || cancelled() }}
         uses: actions/upload-artifact@v3
         with:
-          name: ${{ matrix.os }}-${{ matrix.ln }}-${{ matrix.container }}-${{ matrix.documentation }}-logs
+          name: ${{ matrix.os }}-logs
           path: ./build/**/*.log