From 9c42e7a25e3fa6c7fa3671fdebedf9117197e651 Mon Sep 17 00:00:00 2001
From: Ryan Kelly <rfkelly@mozilla.com>
Date: Mon, 2 Apr 2018 14:40:57 +1000
Subject: [PATCH] Automatically push feature.* branches to docker hub.

---
 circle.yml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/circle.yml b/circle.yml
index 3c49176..0c9d424 100644
--- a/circle.yml
+++ b/circle.yml
@@ -50,12 +50,19 @@ test:
 # appropriately tag and push the container to dockerhub
 deployment:
   hub_latest:
-    branch: "master"
+    # push certain branches, they are used by fxa-dev for deployment
+    branch: /^(master|feature.*|dockerpush.*)$/
     commands:
       - "[ ! -z $DOCKERHUB_REPO ]"
-      - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
-      - "docker tag syncserver:build ${DOCKERHUB_REPO}:latest"
-      - "docker push ${DOCKERHUB_REPO}:latest"
+      - docker login -e "$DOCKER_EMAIL" -u "$DOCKER_USER" -p "$DOCKER_PASS"
+      - |
+          if [ $CIRCLE_BRANCH = "master" ]; then
+            CIRCLE_BRANCH=latest
+          fi
+          echo ${DOCKERHUB_REPO}:${CIRCLE_BRANCH}
+          docker tag syncserver:build ${DOCKERHUB_REPO}:${CIRCLE_BRANCH}
+          docker push ${DOCKERHUB_REPO}:${CIRCLE_BRANCH}
+
 
   hub_releases:
     # push all tags