From 1a2fa73941d8c18525e0cc6578b6d8348db92982 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 1 Oct 2019 22:37:42 +0000
Subject: [PATCH] [CORL-663] v4 release fixes (#2613)

* fix: removed latest pushing from docker deploy script

* fix: addressed circleci bug
---
 .circleci/config.yml |  9 +++------
 scripts/docker.sh    | 13 ++-----------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5f3f52eee..cca7e4e2c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -221,20 +221,17 @@ jobs:
 # only execute on a deploy related job.
 filter_deploy: &filter_deploy
   filters:
-    branches:
-      only:
-        - master
-        - next
     tags:
       only: /v[0-9]+(\.[0-9]+)*/
+    branches:
+      ignore: /.*/
 
 # filter_develop will add the filters for a development related commit.
 filter_develop: &filter_develop
   filters:
     branches:
       ignore:
-        - master
-        - next
+        - /release\/.*/
 
 workflows:
   version: 2
diff --git a/scripts/docker.sh b/scripts/docker.sh
index dc5759e5e..cc409036b 100755
--- a/scripts/docker.sh
+++ b/scripts/docker.sh
@@ -30,7 +30,7 @@ deploy_tag() {
   done
 
   # Push each of the tags to dockerhub, including latest
-  for version in $tag_list latest
+  for version in $tag_list
   do
       echo "==> pushing $version"
       docker push coralproject/talk:$version
@@ -38,12 +38,6 @@ deploy_tag() {
   done
 }
 
-deploy_latest() {
-  echo "==> pushing latest"
-  docker push coralproject/talk:latest
-  docker push coralproject/talk:latest-onbuild
-}
-
 deploy_branch() {
   echo "==> tagging branch $CIRCLE_BRANCH"
   docker tag coralproject/talk:latest coralproject/talk:$CIRCLE_BRANCH
@@ -80,10 +74,7 @@ then
   then
     deploy_tag
   else
-    if [ "$CIRCLE_BRANCH" = "master" ]
-    then
-      deploy_latest
-    else
+    if [ "$CIRCLE_BRANCH" != "master" ]
       deploy_branch
     fi
   fi