From 0d58d5bf231bceb31bb397c1eafa818ebdf7459d Mon Sep 17 00:00:00 2001 From: Clement Michaud Date: Thu, 1 Jun 2017 22:46:42 +0200 Subject: [PATCH] Choose deployment based on tag or master branch depending on Travis env vars --- scripts/docker-publish.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/scripts/docker-publish.sh b/scripts/docker-publish.sh index 682d5f547..bcf80f807 100755 --- a/scripts/docker-publish.sh +++ b/scripts/docker-publish.sh @@ -1,16 +1,14 @@ #!/bin/bash -if [ "$TRAVIS_BRANCH" == "master" ]; then +# Parameters: +# TAG - The name of the tag to use for publishing in Dockerhub +# +function deploy_on_dockerhub { echo "=======================================" echo "Authelia will be deployed on Dockerhub." echo "=======================================" - echo "TRAVIS_TAG='$TRAVIS_TAG'" - - TAG=latest - if [ ! -z "$TRAVIS_TAG" ]; then - TAG=$TRAVIS_TAG - fi + TAG=$1 IMAGE_NAME=clems4ever/authelia IMAGE_WITH_TAG=$IMAGE_NAME:$TAG @@ -21,7 +19,13 @@ if [ "$TRAVIS_BRANCH" == "master" ]; then docker tag $IMAGE_NAME $IMAGE_WITH_TAG; docker push $IMAGE_WITH_TAG; echo "Docker image deployed successfully." +} + +if [ "$TRAVIS_BRANCH" == "master" ]; then + deploy_on_dockerhub latest +elif [ ! -z "$TRAVIS_TAG" ]; then + deploy_on_dockerhub $TRAVIS_TAG else echo "Docker image will not be deployed on Dockerhub." fi