From 4bd2b9e3c04ff61d2b2c716713d4ad7e65cacdba Mon Sep 17 00:00:00 2001
From: Alberto Bertogli <albertito@blitiri.com.ar>
Date: Sat, 14 Aug 2021 11:03:07 +0100
Subject: [PATCH] gitlab-ci: Push a `latest` tag to Docker repositories

When doing a `docker pull`, if a tag is not specified, it defaults to
`latest`. We currently don't push such a tag, so it can cause confusion
in some cases (e.g. https://github.com/albertito/chasquid/issues/21).

To help prevent this, make the docker automatic builds for `master` also
apply the `latest` tag.

As a part of this, update the obsolete `$CI_BUILD_REF_NAME` to
`$CI_COMMIT_REF_NAME`.
---
 .gitlab-ci.yml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e9aa0ff..782e718 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -76,8 +76,13 @@ gitlab:
   script:
     - docker info
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker build -t $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME -f docker/Dockerfile .
-    - docker push $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME
+    - docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME -f docker/Dockerfile .
+    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
+    - |
+      if [ $CI_COMMIT_REF_NAME == master ]; then
+          docker tag $CI_REGISTRY_IMAGE:master $CI_REGISTRY_IMAGE:latest
+          docker push $CI_REGISTRY_IMAGE:latest
+      fi
 
 # Build docker image, upload to dockerhub registry.
 dockerhub:
@@ -90,5 +95,10 @@ dockerhub:
   script:
     - docker info
     - docker login -u $DOCKER_REGISTRY_USER -p $DOCKER_REGISTRY_PASSWORD docker.io
-    - docker build -t index.docker.io/albertito/chasquid:$CI_BUILD_REF_NAME -f docker/Dockerfile .
-    - docker push index.docker.io/albertito/chasquid:$CI_BUILD_REF_NAME
+    - docker build -t index.docker.io/albertito/chasquid:$CI_COMMIT_REF_NAME -f docker/Dockerfile .
+    - docker push index.docker.io/albertito/chasquid:$CI_COMMIT_REF_NAME
+    - |
+      if [ $CI_COMMIT_REF_NAME == master ]; then
+          docker tag index.docker.io/albertito/chasquid:master index.docker.io/albertito/chasquid:latest
+          docker push index.docker.io/albertito/chasquid:latest
+      fi