Update naming of Docker release

CARV-ICS-FORTH · Aug 31, 2022 · f697505 · f697505
1 parent cc7b72f
commit f697505
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/.github/workflows/release-docker-images.yml b/.github/workflows/release-docker-images.yml
@@ -3,8 +3,6 @@ name: Release Docker Images
 on:
   workflow_dispatch:
   push:
-    branches:
-      - main
     tags:
       - "v[0-9]+.[0-9]+.[0-9]+"
       - "v[0-9]+.[0-9]+.[0-9]+-*"

diff --git a/.github/workflows/release-helm-charts.yml b/.github/workflows/release-helm-charts.yml
@@ -3,8 +3,6 @@ name: Release Helm Charts
 on:
   workflow_dispatch:
   push:
-    branches:
-      - main
     tags:
       - "v[0-9]+.[0-9]+.[0-9]+"
       - "v[0-9]+.[0-9]+.[0-9]+-*"

diff --git a/.github/workflows/release-kubectl-frisbee.yml b/.github/workflows/release-kubectl-frisbee.yml
@@ -3,8 +3,6 @@ name: Release kubectl-frisbee
 on:
   workflow_dispatch:
   push:
-    branches:
-      - main
     tags:
       - "v[0-9]+.[0-9]+.[0-9]+"
       - "v[0-9]+.[0-9]+.[0-9]+-*"

diff --git a/Makefile b/Makefile
@@ -151,9 +151,9 @@ docker-run: docker-build ## Build and Run docker image for the Frisbee controlle
 ##@ Deployment
 docker-push: docker-build ## Push the latest docker image for Frisbee controller.
 	@echo "===> Tag ${IMG} as frisbee-operator:latest <==="
-	docker tag ${IMG} $(IMAGE_TAG_BASE)/frisbee-operator:latest
+	docker tag ${IMG} $(IMAGE_TAG_BASE)/frisbee-operator:${FrisbeeVersion}
 	@echo "===> Push frisbee:operator:latest <==="
-	docker push $(IMAGE_TAG_BASE)/frisbee-operator:latest
+	docker push $(IMAGE_TAG_BASE)/frisbee-operator:${FrisbeeVersion}
 
 
 install: generate ## Deploy platform to the K8s cluster specified in ~/.kube/config.