From 09b4bcadd4ac92b6a91770210a738cf18fc12488 Mon Sep 17 00:00:00 2001
From: Clement Michaud <clement.michaud34@gmail.com>
Date: Sun, 8 Oct 2017 18:56:18 +0200
Subject: [PATCH] Deploy latest along with release tag

Prior to this fix, every master commits was released to Dockerhub under latest
tag and tagged commit was released with a version tag in Dockerhub.
'Latest' tag in dockerhub should reference the latest released version and not
the head of master branch.

Thus, after this fix, 'latest' tag references the latest released version of
Authelia and 'master' tag references the head of master git branch.
---
 scripts/docker-publish.sh | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/scripts/docker-publish.sh b/scripts/docker-publish.sh
index 9808615ab..3d9d84e0e 100755
--- a/scripts/docker-publish.sh
+++ b/scripts/docker-publish.sh
@@ -2,16 +2,8 @@
 
 # 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 "======================================="
-
-  TAG=$1
-  IMAGE_NAME=clems4ever/authelia
-  IMAGE_WITH_TAG=$IMAGE_NAME:$TAG
 
+function login_to_dockerhub {
   echo "Logging in to Dockerhub as $DOCKER_USERNAME."
   docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
   if [ "$?" -ne "0" ];
@@ -19,8 +11,16 @@ function deploy_on_dockerhub {
     echo "Logging in to Dockerhub failed.";
     exit 1
   fi
+}
 
+function deploy_on_dockerhub {
+  TAG=$1
+  IMAGE_NAME=clems4ever/authelia
+  IMAGE_WITH_TAG=$IMAGE_NAME:$TAG
+
+  echo "==========================================================="
   echo "Docker image $IMAGE_WITH_TAG will be deployed on Dockerhub."
+  echo "==========================================================="
   docker build -t $IMAGE_NAME .
   docker tag $IMAGE_NAME $IMAGE_WITH_TAG;
   docker push $IMAGE_WITH_TAG;
@@ -29,9 +29,12 @@ function deploy_on_dockerhub {
 
 
 if [ "$TRAVIS_BRANCH" == "master" ]; then
-  deploy_on_dockerhub latest
+  login_to_dockerhub
+  deploy_on_dockerhub master
 elif [ ! -z "$TRAVIS_TAG" ]; then
+  login_to_dockerhub
   deploy_on_dockerhub $TRAVIS_TAG
+  deploy_on_dockerhub latest
 else
   echo "Docker image will not be deployed on Dockerhub."
 fi