Even more docker image tag shenanigans

Author: MrTalon63

.github/workflows/docker.yml

@@ -3,8 +3,6 @@ name: Docker Image CI
 on:
     push:
         branches: ["**"]
-    pull_request:
-        branches: ["master"]
     workflow_dispatch:
 
 jobs:
@@ -36,13 +34,8 @@ jobs:
               id: version
               run: |
                   VERSION=$(jq -r '.version' package.json)
-                  GIT_TAG=$(git describe --exact-match --tags HEAD 2>/dev/null || echo "")
-                  if [ -z "$GIT_TAG" ]; then
-                    VERSION_TAG="${VERSION}-dirty"
-                  else
-                    VERSION_TAG="${VERSION}"
-                  fi
-                  echo "version_tag=${VERSION_TAG}" >> $GITHUB_OUTPUT
+                  echo "version_tag=${VERSION}" >> $GITHUB_OUTPUT
+                  echo "short_sha=${GITHUB_SHA::7}" >> $GITHUB_OUTPUT
 
             - name: Build and push (master)
               if: github.ref == 'refs/heads/master'
@@ -63,4 +56,5 @@ jobs:
                   push: true
                   platforms: linux/amd64,linux/arm64
                   tags: |
-                      ghcr.io/${{ env.IMAGE_NAME }}:nightly-${{ github.sha }}
+                      ghcr.io/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
+                      ghcr.io/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-${{ steps.version.outputs.short_sha }}