From 3d3914645d92974f67935aaff95855915d0a0793 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Mon, 20 May 2024 23:35:36 +0300
Subject: [PATCH] Attempt docker release fix 4

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

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 6060908c2..3602a09fe 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -68,8 +68,7 @@ jobs:
           # Release version tag if the workflow is triggered by a release
           # Branch name tag if the workflow is triggered by a push
           tags: |
-            ${{ github.event_name == 'release' && github.ref_name }}
-            ${{ github.event_name != 'release' && env.BRANCH_NAME }}
+            ${{ github.event_name == 'release' && github.ref_name || env.BRANCH_NAME }}
 
       # Login into package repository as the person who created the release
       - name: Log in to the Container registry
@@ -96,5 +95,5 @@ jobs:
       - name: Docker tag latest and push
         if: ${{ github.event_name == 'release' }}
         run: |
-          docker tag $IMAGE_NAME:${{ github.ref_name }} $IMAGE_NAME:latest
-          docker push $IMAGE_NAME:latest
+            docker tag ${{ env.IMAGE_NAME }} ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+            docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest