From 28b1a76ae8677b7747255e308a4dd05dc1859d91 Mon Sep 17 00:00:00 2001
From: Max Litruv Boonzaayer <litruv@gmail.com>
Date: Mon, 12 Jun 2023 15:26:08 +1000
Subject: [PATCH] Update docker-push.yml

---
 .github/workflows/docker-push.yml | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml
index c054fca..0c79f7a 100644
--- a/.github/workflows/docker-push.yml
+++ b/.github/workflows/docker-push.yml
@@ -19,10 +19,17 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
+      - name: Log into GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Set up environment variables
         id: env
         run: |
-          echo "IMAGE_TAG=api-websocket-bridge-${{ github.event.release.tag_name }}" >> $GITHUB_ENV
+          echo "IMAGE_TAG=${{ github.event.release.tag_name }}" >> $GITHUB_ENV
 
       - name: Build and push Docker image to Docker Hub
         uses: docker/build-push-action@v2
@@ -31,21 +38,9 @@ jobs:
           push: true
           tags: docker.io/litruv/api-websocket-bridge:${{ env.IMAGE_TAG }}
 
-      - name: Log into GitHub Docker Registry
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Transform tag to lowercase
-        id: lowercase
-        run: |
-          echo "::set-output name=TAG::$(echo ${{ env.IMAGE_TAG }} | tr '[:upper:]' '[:lower:]')"
-
-      - name: Build and push Docker image to GitHub Docker Registry
+      - name: Build and push Docker image to GitHub Container Registry
         uses: docker/build-push-action@v2
         with:
           context: .
           push: true
-          tags: ghcr.io/${{ github.repository }}/api-websocket-bridge:${{ steps.lowercase.outputs.TAG }}
+          tags: ghcr.io/${{ github.repository_owner }}/api-websocket-bridge:${{ env.IMAGE_TAG }}