From 38ba3eafa68f727840ad3bd256610dec9775b379 Mon Sep 17 00:00:00 2001 From: Otto van der Schaaf Date: Fri, 17 Apr 2020 16:22:19 +0200 Subject: [PATCH] release prep: push docker image upon tagging Signed-off-by: Otto van der Schaaf --- ci/docker/docker_push.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ci/docker/docker_push.sh b/ci/docker/docker_push.sh index 4116590af..9fd065a87 100755 --- a/ci/docker/docker_push.sh +++ b/ci/docker/docker_push.sh @@ -13,11 +13,19 @@ fi DOCKER_IMAGE_PREFIX="${DOCKER_IMAGE_PREFIX:-envoyproxy/nighthawk}" # push the nighthawk image on tags or merge to master -if [[ -n "$CIRCLE_TAG" ]] || [[ "$CIRCLE_BRANCH" = 'master' ]]; then +if [[ "$CIRCLE_BRANCH" = 'master' ]]; then docker login -u "$DOCKERHUB_USERNAME" -p "$DOCKERHUB_PASSWORD" docker push "${DOCKER_IMAGE_PREFIX}-dev:latest" docker tag "${DOCKER_IMAGE_PREFIX}-dev:latest" "${DOCKER_IMAGE_PREFIX}-dev:${CIRCLE_SHA1}" docker push "${DOCKER_IMAGE_PREFIX}-dev:${CIRCLE_SHA1}" else - echo 'Ignoring non-master branch for docker push.' + if [[ -n "$CIRCLE_TAG" ]]; then + TAG="$CIRCLE_TAG" + docker login -u "$DOCKERHUB_USERNAME" -p "$DOCKERHUB_PASSWORD" + docker push "${DOCKER_IMAGE_PREFIX}:${TAG}" + docker tag "${DOCKER_IMAGE_PREFIX}:${TAG}" "${DOCKER_IMAGE_PREFIX}:${TAG}" + docker push "${DOCKER_IMAGE_PREFIX}:${TAG}" + else + echo 'Ignoring non-master branch for docker push.' + fi fi