From 58d39bed6ccab7938914193c3198a1d93b62fb6c Mon Sep 17 00:00:00 2001 From: David Chung Date: Wed, 1 Feb 2017 16:19:45 -0800 Subject: [PATCH 1/2] build container on release branches Signed-off-by: David Chung --- circle.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/circle.yml b/circle.yml index 92e818ee7..1f26e6422 100644 --- a/circle.yml +++ b/circle.yml @@ -41,8 +41,14 @@ test: - cd $WORKDIR && bash <(curl -s https://codecov.io/bash) deployment: + release: + branch: /release-.*/ + commands: + - docker login -e $DOCKER_HUB_EMAIL -u $DOCKER_HUB_USER -p $DOCKER_HUB_PASSWD + - DOCKER_PUSH=true DOCKER_TAG_LATEST=false DOCKER_TAG="$CIRCLE_BRANCH" DOCKER_BUILD_FLAGS="--rm=false" make build-docker docker: branch: master commands: - docker login -e $DOCKER_HUB_EMAIL -u $DOCKER_HUB_USER -p $DOCKER_HUB_PASSWD - DOCKER_PUSH=true DOCKER_TAG_LATEST=true DOCKER_TAG="master-$CIRCLE_BUILD_NUM" DOCKER_BUILD_FLAGS="--rm=false" make build-docker + \ No newline at end of file From 544381e655aaeb507c75b61daf2ceebf14f6ca33 Mon Sep 17 00:00:00 2001 From: David Chung Date: Wed, 1 Feb 2017 18:50:44 -0800 Subject: [PATCH 2/2] change tag naming Signed-off-by: David Chung --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 1f26e6422..2bc515c30 100644 --- a/circle.yml +++ b/circle.yml @@ -45,7 +45,7 @@ deployment: branch: /release-.*/ commands: - docker login -e $DOCKER_HUB_EMAIL -u $DOCKER_HUB_USER -p $DOCKER_HUB_PASSWD - - DOCKER_PUSH=true DOCKER_TAG_LATEST=false DOCKER_TAG="$CIRCLE_BRANCH" DOCKER_BUILD_FLAGS="--rm=false" make build-docker + - DOCKER_PUSH=true DOCKER_TAG_LATEST=false DOCKER_TAG=$(echo $CIRCLE_BRANCH | awk -F - '{print $2}') DOCKER_BUILD_FLAGS="--rm=false" make build-docker docker: branch: master commands: