From 03aa3b7cbd99ddb0cd2e18bcbc25be5fa423d82d Mon Sep 17 00:00:00 2001
From: Robert Fratto <robertfratto@gmail.com>
Date: Tue, 19 Mar 2024 14:14:14 -0400
Subject: [PATCH] tools/ci: sanitize Docker tags

Sanitize Docker tags to remove characters used in semver that are not
valid in Docker tags (primarily `+`)
---
 tools/ci/docker-containers | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/tools/ci/docker-containers b/tools/ci/docker-containers
index 76f5c1d19f..9a421eb8cb 100755
--- a/tools/ci/docker-containers
+++ b/tools/ci/docker-containers
@@ -44,6 +44,11 @@ else
   VERSION=$(./tools/image-tag)
 fi
 
+# The TAG_VERSION is the version to use for the Docker tag. It is sanitized to
+# force it to be a valid tag name; ./tools/image-tag can emit characters that
+# are valid for semver but invalid for Docker tags, such as +.
+TAG_VERSION=${VERSION//+/-}
+
 # We also need to know which "branch tag" to update. Branch tags are used as a
 # secondary tag for Docker containers. The branch tag is "latest" when being
 # tagged from a stable release (i.e., not a release candidate).
@@ -54,7 +59,7 @@ fi
 if [ -n "$DRONE_TAG" ] && [[ "$DRONE_TAG" != *"-rc."* ]]; then
   BRANCH_TAG=latest
 else
-  BRANCH_TAG=$VERSION
+  BRANCH_TAG=$TAG_VERSION
 fi
 
 # Build all of our images.
@@ -68,21 +73,21 @@ case "$TARGET_CONTAINER" in
       --platform $BUILD_PLATFORMS     \
       --build-arg RELEASE_BUILD=1     \
       --build-arg VERSION="$VERSION"  \
-      -t "$AGENT_IMAGE:$VERSION"      \
+      -t "$AGENT_IMAGE:$TAG_VERSION"  \
       -t "$AGENT_IMAGE:$BRANCH_TAG"   \
       -f cmd/grafana-agent/Dockerfile \
       .
     ;;
 
   agent-boringcrypto)
-    docker buildx build --push        \
-      --platform $BUILD_PLATFORMS_BORINGCRYPTO     \
-      --build-arg RELEASE_BUILD=1     \
-      --build-arg VERSION="$VERSION"  \
-      --build-arg GOEXPERIMENT=boringcrypto \
-      -t "$AGENT_BORINGCRYPTO_IMAGE:$VERSION"      \
-      -t "$AGENT_BORINGCRYPTO_IMAGE:$BRANCH_TAG"   \
-      -f cmd/grafana-agent/Dockerfile \
+    docker buildx build --push                    \
+      --platform $BUILD_PLATFORMS_BORINGCRYPTO    \
+      --build-arg RELEASE_BUILD=1                 \
+      --build-arg VERSION="$VERSION"              \
+      --build-arg GOEXPERIMENT=boringcrypto       \
+      -t "$AGENT_BORINGCRYPTO_IMAGE:$TAG_VERSION" \
+      -t "$AGENT_BORINGCRYPTO_IMAGE:$BRANCH_TAG"  \
+      -f cmd/grafana-agent/Dockerfile             \
       .
     ;;