From 26487f7d921435f0b4ddbed8afdb5544e75e37a1 Mon Sep 17 00:00:00 2001 From: Nicholas Long Date: Tue, 20 Feb 2018 21:00:17 -0700 Subject: [PATCH] deploy fix for docker hub --- circle.yml | 4 ++-- docker/deployment/scripts/circle_deployment.sh | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/circle.yml b/circle.yml index c2983f932..f085c2544 100644 --- a/circle.yml +++ b/circle.yml @@ -32,9 +32,9 @@ test: - rsync -av reports/ $CIRCLE_ARTIFACTS/reports/ deployment: - hub: + production: + branch: [develop, master, 240-270-docker-hub] commands: - git checkout -- .dockerignore && git checkout -- Dockerfile - docker-compose build --pull - - docker login -u $DOCKER_USER -p $DOCKER_PASS - source docker/deployment/scripts/circle_deployment.sh diff --git a/docker/deployment/scripts/circle_deployment.sh b/docker/deployment/scripts/circle_deployment.sh index cbd49022f..489dc6476 100644 --- a/docker/deployment/scripts/circle_deployment.sh +++ b/docker/deployment/scripts/circle_deployment.sh @@ -2,7 +2,9 @@ IMAGETAG=skip if [ "${CIRCLE_BRANCH}" == "develop" ]; then - IMAGETAG=develop + IMAGETAG=latest +elif [ "${CIRCLE_BRANCH}" == "240-270-docker-hub" ]; then + IMAGETAG=test elif [ "${CIRCLE_BRANCH}" == "master" ]; then # Retrieve the version number from rails IMAGETAG="$(ruby -e "load 'server/lib/openstudio_server/version.rb'; print OpenstudioServer::VERSION+OpenstudioServer::VERSION_EXT")" @@ -11,7 +13,8 @@ fi if [ "${IMAGETAG}" != "skip" ] && [ -z ${CI_PULL_REQUEST} ]; then # If CI_PULL_REQUEST is set, then the -z returns false (counter-intuitive) docker-compose build --pull - docker login -u $DOCKER_USER -p $DOCKER_PASS + # Still need email with circleci, presumably because of the version of docker. + docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS echo "Tagging image as $IMAGETAG" docker tag nrel/openstudio-server nrel/openstudio-server:$IMAGETAG