Skip to content

Commit f2b62a6

Browse files
Fix: make sure no invalid docker tags are applied through invalid or unavailable git branch names (#48)
* fix: check if branch name is empty before applying tag * fix: transform branch name into valid docker tag before application * fix: use 68337 to treat DOCKER_TAG as a local var * fix: use 68337 to treat DOCKER_TAG as a local var * fix: use builtin substitution for PROJECT_ID
1 parent b9d573c commit f2b62a6

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

cloudbuild.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,19 @@ steps:
1515
- "-c"
1616
- |
1717
# Prepare tag list
18-
TAGS="-t us-docker.pkg.dev/$PROJECT_ID/nebulous/server:$SHORT_SHA -t us-docker.pkg.dev/$PROJECT_ID/nebulous/server:$BRANCH_NAME"
18+
TAGS="-t us-docker.pkg.dev/$PROJECT_ID/nebulous/server:$SHORT_SHA"
19+
20+
# Add branch name tag if BRANCH_NAME is not empty
21+
if [ -n "$BRANCH_NAME" ]; then
22+
echo "Detected branch: $BRANCH_NAME. Adding branch tag."
23+
DOCKER_TAG=$(echo "$BRANCH_NAME" | sed 's/[^a-z0-9._-]/-/g' | sed 's/^[.-]//' | sed 's/[.-]$//')
24+
echo "Transformed branch $BRANCH_NAME to Docker tag: $$DOCKER_TAG"
25+
TAGS="$$TAGS -t us-docker.pkg.dev/$PROJECT_ID/nebulous/server:$$DOCKER_TAG"
26+
fi
1927
2028
# Add latest tag if on main branch
2129
if [ "$BRANCH_NAME" == "main" ]; then
30+
echo "Detected main branch. Adding latest tag."
2231
TAGS="$$TAGS -t us-docker.pkg.dev/$PROJECT_ID/nebulous/server:latest"
2332
fi
2433

0 commit comments

Comments
 (0)