Skip to content

Commit

Permalink
Fixes to Dockerhub release tagging (#1777)
Browse files Browse the repository at this point in the history
Signed-off-by: bndw <[email protected]>
  • Loading branch information
bndw authored and mattklein123 committed Sep 29, 2017
1 parent 8a95827 commit 7789c5d
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
6 changes: 6 additions & 0 deletions ci/do_circle_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

set -e

if [ -n "$CIRCLE_TAG" ]
then
echo 'Ignoring build for git tag event'
exit 0
fi

# bazel uses jgit internally and the default circle-ci .gitconfig says to
# convert https://github.com to ssh://[email protected], which jgit does not support.
mv ~/.gitconfig ~/.gitconfig_save
Expand Down
10 changes: 10 additions & 0 deletions ci/docker_tag.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@ set -e

if [ -n "$CIRCLE_TAG" ]
then
# TODO(mattklein123): Currently we are doing this push in the context of the release job which
# happens inside of our build image. We should switch to using Circle caching so each of these
# are discrete jobs that work with the binary. All of these commands run on a remote docker
# server also so we have to temporarily install docker here.
# https://circleci.com/docs/2.0/building-docker-images/
VER="17.03.0-ce"
curl -L -o /tmp/docker-"$VER".tgz https://get.docker.com/builds/Linux/x86_64/docker-"$VER".tgz
tar -xz -C /tmp -f /tmp/docker-"$VER".tgz
mv /tmp/docker/* /usr/bin

docker login -u "$DOCKERHUB_USERNAME" -p "$DOCKERHUB_PASSWORD"

docker pull lyft/envoy:"$CIRCLE_SHA1"
Expand Down

0 comments on commit 7789c5d

Please sign in to comment.