Merge branch 'release/1.2.0' into main

spencerbeggs · Oct 3, 2020 · 691e3ef · 691e3ef
2 parents 873e1f5 + 4ee8814
commit 691e3ef
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Prepare
         id: prep
         run: |
-          DOCKER_IMAGE=$(echo "$GITHUB_REPOSITORY")
+          DOCKER_IMAGE=ghcr.io/$(echo "$GITHUB_REPOSITORY")
           DOCKER_VERSION=noop
           if [ "${{ github.event_name }}" = "schedule" ]; then
             DOCKER_VERSION=nightly
@@ -51,7 +51,7 @@ jobs:
           DOCKER_TAGS="${DOCKER_IMAGE}:${DOCKER_VERSION}"
           if [[ $DOCKER_VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
             MINOR=${DOCKER_VERSION%.*}
-            MAJOR=${DOCKER_VERSION%.*}
+            MAJOR=${MINOR%.*}
             DOCKER_TAGS="$DOCKER_TAGS,${DOCKER_IMAGE}:${MINOR},${DOCKER_IMAGE}:${MAJOR},${DOCKER_IMAGE}:latest"
           elif [ "${{ github.event_name }}" = "push" ]; then
             DOCKER_TAGS="$DOCKER_TAGS,${DOCKER_IMAGE}:sha-${GITHUB_SHA::8}"