From bbd0414c3749d6c2d68755c5225fdff165e8de5b Mon Sep 17 00:00:00 2001
From: joffrey-bion <joffrey.bion@gmail.com>
Date: Thu, 28 Jan 2021 12:03:21 +0100
Subject: Clarify docker image tags (sha and build)

---
 .github/workflows/ci.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 74c694dc..88f9f05f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,6 +9,8 @@ on:
 env:
   DOCKERHUB_USER: hildan
   DOCKER_IMAGE_NAME: seven-wonders-server
+  DOCKER_IMAGE_TAG_SHA: sha-${{ github.sha }}
+  DOCKER_IMAGE_TAG_BUILD: build-${{ github.run_id }}
   HEROKU_APP_NAME: seven-wonders-online
 
 jobs:
@@ -74,9 +76,11 @@ jobs:
           push: true
           tags: |
             ${{ env.DOCKERHUB_USER }}/${{ env.DOCKER_IMAGE_NAME }}:latest
-            ${{ env.DOCKERHUB_USER }}/${{ env.DOCKER_IMAGE_NAME }}:${{ github.sha }}
+            ${{ env.DOCKERHUB_USER }}/${{ env.DOCKER_IMAGE_NAME }}:${{ env.DOCKER_IMAGE_TAG_SHA }}
+            ${{ env.DOCKERHUB_USER }}/${{ env.DOCKER_IMAGE_NAME }}:${{ env.DOCKER_IMAGE_TAG_BUILD }}
             ghcr.io/${{ github.repository_owner }}/${{ env.DOCKER_IMAGE_NAME }}:latest
-            ghcr.io/${{ github.repository_owner }}/${{ env.DOCKER_IMAGE_NAME }}:${{ github.sha }}
+            ghcr.io/${{ github.repository_owner }}/${{ env.DOCKER_IMAGE_NAME }}:${{ env.DOCKER_IMAGE_TAG_SHA }}
+            ghcr.io/${{ github.repository_owner }}/${{ env.DOCKER_IMAGE_NAME }}:${{ env.DOCKER_IMAGE_TAG_BUILD }}
             registry.heroku.com/${{ env.HEROKU_APP_NAME }}/web
 
       - name: Heroku release (deploy Docker image)
-- 
cgit