From 55f0bdc033582fcf78411e21d25cd7b2d80fc218 Mon Sep 17 00:00:00 2001
From: Todd Volkert <tvolkert@users.noreply.github.com>
Date: Mon, 9 Dec 2019 12:56:47 -0800
Subject: [PATCH] Fix docker tag during upload as well (#46252)

In https://github.com/flutter/flutter/pull/46035, we fixed the docker
tag to be a legal tag during build.  This PR makes the corresponding
change to the tag during upload.  Without this, we build the right tag,
but then we try to upload the wrong tag.
---
 dev/ci/docker_linux/docker_push.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev/ci/docker_linux/docker_push.sh b/dev/ci/docker_linux/docker_push.sh
index 84620af6f..152161ec0 100755
--- a/dev/ci/docker_linux/docker_push.sh
+++ b/dev/ci/docker_linux/docker_push.sh
@@ -5,5 +5,8 @@
 
 TAG="${CIRRUS_TAG:-latest}"
 
-sudo docker push "gcr.io/flutter-cirrus/build-flutter-image:$TAG"
+# Convert "+" to "-" to make hotfix tags legal Docker tag names.
+# See https://docs.docker.com/engine/reference/commandline/tag/
+TAG=${TAG/+/-}
 
+sudo docker push "gcr.io/flutter-cirrus/build-flutter-image:$TAG"