[CORL-663] v4 release fixes (#2613)

* fix: removed latest pushing from docker deploy script

* fix: addressed circleci bug
This commit is contained in:
Wyatt Johnson
2019-10-01 22:37:42 +00:00
committed by GitHub
parent d3931db285
commit 1a2fa73941
2 changed files with 5 additions and 17 deletions
+3 -6
View File
@@ -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
+2 -11
View File
@@ -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