fix(cicd): fix default value for TAG env var (#2770)

kubeshop · Jun 21, 2023 · adaf2d7 · adaf2d7
1 parent fa16960
commit adaf2d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.goreleaser.dev.yaml b/.goreleaser.dev.yaml
@@ -17,7 +17,7 @@ before:
 env:
   - VERSION={{ if index .Env "VERSION"  }}{{ .Env.VERSION }}{{ else }}dev{{ end }}
   # if TAG is defined, use it. Fallback to VERSION
-  - TAG={{ if index .Env "TAG"  }}{{ .Env.TAG }}{{ else }}{{ .Env.VERSION }}{{ end }}
+  - TAG={{ if index .Env "TAG"  }}{{ .Env.TAG }}{{ else }}{{ if index .Env "VERSION"  }}{{ .Env.VERSION }}{{ else }}dev{{ end }}{{ end }}
   - TRACETEST_ENV={{ if index .Env "TRACETEST_ENV"  }}{{ .Env.TRACETEST_ENV }}{{ else }}dev{{ end }}
   - ANALYTICS_BE_KEY={{ if index .Env "ANALYTICS_BE_KEY"  }}{{ .Env.ANALYTICS_BE_KEY }}{{ else }}{{ end }}
   - ANALYTICS_FE_KEY={{ if index .Env "ANALYTICS_FE_KEY"  }}{{ .Env.ANALYTICS_FE_KEY }}{{ else }}{{ end }}

diff --git a/Makefile b/Makefile
@@ -108,4 +108,4 @@ clean: ## cleans the build artifacts
 	rm -rf dist
 	rm -rf web/build
 	rm -rf web/node_modules
-	docker rm image "kubeshop/tracetest:$(TAG)"
+	docker image rm "kubeshop/tracetest:$(TAG)"