From 73727bd9d8b0cb6761631558f37bcb6347366142 Mon Sep 17 00:00:00 2001 From: Bobby Brennan Date: Fri, 14 Jun 2019 12:16:02 -0600 Subject: [PATCH] Fix image update for version tags (#150) --- .circleci/build.config | 5 +++++ .circleci/config.yml | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.circleci/build.config b/.circleci/build.config index 1237e75c4..210571068 100644 --- a/.circleci/build.config +++ b/.circleci/build.config @@ -3,3 +3,8 @@ DOCKERFILE='Dockerfile' EXTERNAL_REGISTRY_BASE_DOMAIN=quay.io REPOSITORY_NAME=reactiveops/polaris DOCKERTAG=${EXTERNAL_REGISTRY_BASE_DOMAIN}/${REPOSITORY_NAME} +if [[ -n $CI_TAG ]]; then + ADDITIONAL_DOCKER_TAG_VERSIONS=() + ADDITIONAL_DOCKER_TAG_VERSIONS+=(`echo $CI_TAG | sed -e 's/\(\w\+\)\..*$/\1/'`) + ADDITIONAL_DOCKER_TAG_VERSIONS+=(`echo $CI_TAG | sed -e 's/\(\w\+\.\w\+\)\..*$/\1/'`) +fi diff --git a/.circleci/config.yml b/.circleci/config.yml index 6098046fd..9d907fac8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,9 +16,6 @@ references: command: | docker-pull -f .circleci/build.config docker-build -f .circleci/build.config - if [[ -n $CIRCLE_TAG ]]; then - export ADDITIONAL_DOCKER_TAG_VERSIONS=(`echo $CIRCLE_TAG | sed -e 's/\(\w\+\)\..*$/\1/'`) - fi if [[ -z $CIRCLE_PR_NUMBER ]]; then docker login quay.io -u="reactiveops+circleci" -p="${quay_token}" docker-push -f .circleci/build.config