Yet another fix to release tag (volcano-sh#5)

yolgun · Mar 24, 2022 · faa0e88 · faa0e88
1 parent afca5f3
commit faa0e88
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -45,7 +45,7 @@ jobs:
         working-directory: ./src/github.com/${{ github.repository }}
 
       - name: Login to Github container registry
-        uses: docker/login-action@v1.1.1
+        uses: docker/login-action@v1
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -55,6 +55,6 @@ jobs:
         run: make release-images
         env:
           IMAGE_PREFIX: ghcr.io/spotify/volcano/vc
-          VOLCANO_IMAGE_TAG: ${{ steps.prep.outputs.image_tag }}
+          TAG: ${{ steps.prep.outputs.image_tag }}
           CC: /usr/local/musl/bin/musl-gcc
         working-directory: ./src/github.com/${{ github.repository }}
diff --git a/Makefile b/Makefile
@@ -155,14 +155,12 @@ release: images generate-yaml
 	./hack/publish.sh
 
 release-images: images
-	echo "pushing ${IMAGE_PREFIX}-controller-manager:${VOLCANO_IMAGE_TAG}"
-	docker push ${IMAGE_PREFIX}-controller-manager:${VOLCANO_IMAGE_TAG}
-
-	echo "pushing ${IMAGE_PREFIX}-scheduler:${VOLCANO_IMAGE_TAG}"
-	docker push ${IMAGE_PREFIX}-scheduler:${VOLCANO_IMAGE_TAG}
-
-	echo "pushing ${IMAGE_PREFIX}-webhook-manager:${VOLCANO_IMAGE_TAG}"
-	docker push ${IMAGE_PREFIX}-webhook-manager:${VOLCANO_IMAGE_TAG}
+	echo "pushing ${IMAGE_PREFIX}-controller-manager:${TAG}"
+	docker push ${IMAGE_PREFIX}-controller-manager:${TAG}
+	echo "pushing ${IMAGE_PREFIX}-scheduler:${TAG}"
+	docker push ${IMAGE_PREFIX}-scheduler:${TAG}
+	echo "pushing ${IMAGE_PREFIX}-webhook-manager:${TAG}"
+	docker push ${IMAGE_PREFIX}-webhook-manager:${TAG}
 
 clean:
 	rm -rf _output/