From 7df72d36c42a055d53b493d61e3c457c9c92fdb7 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 12 Dec 2019 16:50:23 -0800
Subject: [PATCH] Publish solana-docker releases (#7460) (#7462)

automerge
---
 ci/publish-tarball.sh      |  2 +-
 sdk/docker-solana/build.sh | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ci/publish-tarball.sh b/ci/publish-tarball.sh
index d6f2464955..d267b03ddd 100755
--- a/ci/publish-tarball.sh
+++ b/ci/publish-tarball.sh
@@ -33,7 +33,7 @@ else
 fi
 
 if [[ -z $CHANNEL_OR_TAG ]]; then
-  echo +++ Unable to determine channel to publish into, exiting.
+  echo +++ Unable to determine channel or tag to publish into, exiting.
   exit 0
 fi
 
diff --git a/sdk/docker-solana/build.sh b/sdk/docker-solana/build.sh
index 9308c633bd..a634711823 100755
--- a/sdk/docker-solana/build.sh
+++ b/sdk/docker-solana/build.sh
@@ -5,8 +5,15 @@ cd "$(dirname "$0")"/../..
 eval "$(ci/channel-info.sh)"
 source ci/rust-version.sh
 
-if [[ -z $CHANNEL ]]; then
-  echo Unable to determine channel to publish into, exiting.
+CHANNEL_OR_TAG=
+if [[ -n "$CI_TAG" ]]; then
+  CHANNEL_OR_TAG=$CI_TAG
+else
+  CHANNEL_OR_TAG=$CHANNEL
+fi
+
+if [[ -z $CHANNEL_OR_TAG ]]; then
+  echo Unable to determine channel or tag to publish into, exiting.
   echo "^^^ +++"
   exit 0
 fi
@@ -18,7 +25,7 @@ rm -rf usr/
 
 cp -f ../../run.sh usr/bin/solana-run.sh
 
-docker build -t solanalabs/solana:"$CHANNEL" .
+docker build -t solanalabs/solana:"$CHANNEL_OR_TAG" .
 
 maybeEcho=
 if [[ -z $CI ]]; then
@@ -32,4 +39,4 @@ else
     fi
   )
 fi
-$maybeEcho docker push solanalabs/solana:"$CHANNEL"
+$maybeEcho docker push solanalabs/solana:"$CHANNEL_OR_TAG"