Merge pull request #1266 from coralproject/circle-next

Circle + Docker next

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

scripts/docker.sh

@@ -29,7 +29,7 @@ deploy_tag() {
       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"
@@ -44,6 +44,16 @@ deploy_latest() {
   docker push coralproject/talk:latest-onbuild
 }
 
+deploy_branch() {
+  echo "==> tagging branch $CIRCLE_BRANCH"
+  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"
+  docker push coralproject/talk:$CIRCLE_BRANCH
+  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 .
@@ -58,11 +68,17 @@ then
     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