From 3687fc170247a22224f38e82cfff339c39246793 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Wed, 10 Jan 2018 10:31:43 -0700 Subject: [PATCH 1/2] adjusted build script to build the next branch and release it --- circle.yml | 5 ++++- scripts/docker.sh | 44 ++++++++++++++++++++++++++++++-------------- 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/circle.yml b/circle.yml index ebb746669..44bed4d82 100644 --- a/circle.yml +++ b/circle.yml @@ -62,7 +62,10 @@ deployment: - bash ./scripts/docker.sh deploy latest: - branch: master + branches: + only: + - master + - next owner: coralproject commands: - bash ./scripts/docker.sh deploy diff --git a/scripts/docker.sh b/scripts/docker.sh index 3aae8faf1..3461f6029 100755 --- a/scripts/docker.sh +++ b/scripts/docker.sh @@ -25,28 +25,38 @@ deploy_tag() { for version in $tag_list do echo "==> tagging $version" - docker tag coralproject/talk:latest coralproject/talk:$version - docker tag coralproject/talk:latest-onbuild coralproject/talk:$version-onbuild + echo docker tag coralproject/talk:latest coralproject/talk:$version + echo docker tag coralproject/talk:latest-onbuild coralproject/talk:$version-onbuild done - # Push each of the tags to docker hub, including latest + # Push each of the tags to dockerhub, including latest for version in $tag_list latest do echo "==> pushing $version" - docker push coralproject/talk:$version - docker push coralproject/talk:$version-onbuild + echo docker push coralproject/talk:$version + echo docker push coralproject/talk:$version-onbuild done } deploy_latest() { echo "==> pushing latest" - docker push coralproject/talk:latest - docker push coralproject/talk:latest-onbuild + echo docker push coralproject/talk:latest + echo docker push coralproject/talk:latest-onbuild +} + +deploy_branch() { + echo "==> tagging branch $CIRCLE_BRANCH" + echo docker tag coralproject/talk:latest coralproject/talk:$CIRCLE_BRANCH + echo docker tag coralproject/talk:latest-onbuild coralproject/talk:$CIRCLE_BRANCH-onbuild + + echo "==> pushing branch $CIRCLE_BRANCH" + echo docker push coralproject/talk:$CIRCLE_BRANCH + echo docker push coralproject/talk:$CIRCLE_BRANCH-onbuild } # build the repo, including the onbuild tagged versions. -docker build -t coralproject/talk:latest -f Dockerfile . -docker build -t coralproject/talk:latest-onbuild -f Dockerfile.onbuild . +echo docker build -t coralproject/talk:latest -f Dockerfile . +echo docker build -t coralproject/talk:latest-onbuild -f Dockerfile.onbuild . if [ "$1" = "deploy" ] then @@ -55,14 +65,20 @@ then then # Log the Docker Daemon in - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS + echo docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS fi - # deploy based on the env - if [ -n "$CIRCLE_TAG" ] + if [ "$CIRCLE_BRANCH" = "master" ] then - deploy_tag + + # deploy based on the env + if [ -n "$CIRCLE_TAG" ] + then + deploy_tag + else + deploy_latest + fi else - deploy_latest + deploy_branch fi fi \ No newline at end of file From bbdd69b2a076944a5047246becf61f47962b80e7 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Wed, 10 Jan 2018 10:34:11 -0700 Subject: [PATCH 2/2] removed debug... --- scripts/docker.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/docker.sh b/scripts/docker.sh index 3461f6029..e1e3f9725 100755 --- a/scripts/docker.sh +++ b/scripts/docker.sh @@ -25,38 +25,38 @@ deploy_tag() { for version in $tag_list do echo "==> tagging $version" - echo docker tag coralproject/talk:latest coralproject/talk:$version - echo docker tag coralproject/talk:latest-onbuild coralproject/talk:$version-onbuild + docker tag coralproject/talk:latest coralproject/talk:$version + docker tag coralproject/talk:latest-onbuild coralproject/talk:$version-onbuild done # Push each of the tags to dockerhub, including latest for version in $tag_list latest do echo "==> pushing $version" - echo docker push coralproject/talk:$version - echo docker push coralproject/talk:$version-onbuild + docker push coralproject/talk:$version + docker push coralproject/talk:$version-onbuild done } deploy_latest() { echo "==> pushing latest" - echo docker push coralproject/talk:latest - echo docker push coralproject/talk:latest-onbuild + docker push coralproject/talk:latest + docker push coralproject/talk:latest-onbuild } deploy_branch() { echo "==> tagging branch $CIRCLE_BRANCH" - echo docker tag coralproject/talk:latest coralproject/talk:$CIRCLE_BRANCH - echo docker tag coralproject/talk:latest-onbuild coralproject/talk:$CIRCLE_BRANCH-onbuild + docker tag coralproject/talk:latest coralproject/talk:$CIRCLE_BRANCH + docker tag coralproject/talk:latest-onbuild coralproject/talk:$CIRCLE_BRANCH-onbuild echo "==> pushing branch $CIRCLE_BRANCH" - echo docker push coralproject/talk:$CIRCLE_BRANCH - echo docker push coralproject/talk:$CIRCLE_BRANCH-onbuild + docker push coralproject/talk:$CIRCLE_BRANCH + docker push coralproject/talk:$CIRCLE_BRANCH-onbuild } # build the repo, including the onbuild tagged versions. -echo docker build -t coralproject/talk:latest -f Dockerfile . -echo docker build -t coralproject/talk:latest-onbuild -f Dockerfile.onbuild . +docker build -t coralproject/talk:latest -f Dockerfile . +docker build -t coralproject/talk:latest-onbuild -f Dockerfile.onbuild . if [ "$1" = "deploy" ] then @@ -65,7 +65,7 @@ then then # Log the Docker Daemon in - echo docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS + docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS fi if [ "$CIRCLE_BRANCH" = "master" ]