From 35661794fa3c861278074ab256c99fc5ce2280e7 Mon Sep 17 00:00:00 2001
From: Christopher Bisset <chris@gurucomputing.com.au>
Date: Wed, 27 Jul 2022 17:29:22 +1000
Subject: [PATCH] more CI/CD fixes

---
 .github/workflows/publish-release.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/publish-release.yaml b/.github/workflows/publish-release.yaml
index 5f733bd..fe921a1 100644
--- a/.github/workflows/publish-release.yaml
+++ b/.github/workflows/publish-release.yaml
@@ -22,10 +22,11 @@ jobs:
 
           # setting tags
           if echo "$VERSION" | grep -q "beta"; then
-            TAGS="beta, $VERSION, latest"
+          
+            TAGS="ghcr.io/${{ github.repository }}:beta, ghcr.io/${{ github.repository }}:$VERSION, ghcr.io/${{ github.repository }}:latest"
             PRIMARY_TAG=latest
           else
-            TAGS="release, latest, $VERSION"
+            TAGS="ghcr.io/${{ github.repository }}:release, ghcr.io/${{ github.repository }}:latest, ghcr.io/${{ github.repository }}:$VERSION"
             PRIMARY_TAG=latest
           fi
           echo "::set-output name=TAG::$TAGS"
@@ -46,7 +47,7 @@ jobs:
             VERSION=${{ steps.gathervars.outputs.VERSION }}
           context: ./docker/production
           tags: |
-            ghcr.io/${{ github.repository }}:${{ steps.gathervars.outputs.TAG }}
+            ${{ steps.gathervars.outputs.TAG }}
           push: true
 
       - name: Extract build out of docker image