From 120f990ce1ae309d04542854160f337aa455c670 Mon Sep 17 00:00:00 2001
From: James Hodgkinson <james@terminaloutcomes.com>
Date: Thu, 24 Oct 2024 12:12:20 +1000
Subject: [PATCH] 2856 - use tags for containers on build (#3139)

* ci: push docker image for git tags
* tweaking tag references, such tag, many build

---------

Co-authored-by: guillaumedsde <30023543+guillaumedsde@users.noreply.github.com>
---
 .github/workflows/docker_build_kanidm.yml  | 19 ++++++++++++-------
 .github/workflows/docker_build_kanidmd.yml | 16 +++++++++++-----
 .github/workflows/docker_build_radiusd.yml | 16 +++++++++++-----
 3 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/docker_build_kanidm.yml b/.github/workflows/docker_build_kanidm.yml
index fc8430026..8e351caf0 100644
--- a/.github/workflows/docker_build_kanidm.yml
+++ b/.github/workflows/docker_build_kanidm.yml
@@ -12,22 +12,28 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  set_lower_case_name:
+  set_tag_values:
     runs-on: ubuntu-latest
-    name: set lower case owner name
+    name: Set image tag values
     steps:
       - id: step1
         run: |
           echo "OWNER_LC=${OWNER,,}" >> "${GITHUB_OUTPUT}"
         env:
           OWNER: '${{ github.repository_owner }}'
+      - id: step2
+        run: |
+          echo "REF_NAME=$(echo ${REF_NAME,,} | awk -F/ '{print $1}')" >> "${GITHUB_OUTPUT}"
+        env:
+          REF_NAME: '${{ github.ref_name }}'
     outputs:
       owner_lc: ${{ steps.step1.outputs.OWNER_LC }}
-
+      ref_name: ${{ steps.step2.outputs.REF_NAME }}
   kanidm_build:
     name: Build kanidm Docker image
     runs-on: ubuntu-latest
-    needs: set_lower_case_name
+    needs:
+      - set_tag_values
     steps:
       - uses: actions/checkout@v4
       - name: Set up Docker Buildx
@@ -36,11 +42,10 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           platforms: "linux/amd64"
-          tags: ghcr.io/${{ needs.set_lower_case_name.outputs.owner_lc }}/kanidm:devel
+          tags: ghcr.io/${{ needs.set_tag_values.outputs.owner_lc }}/kanidm:devel,ghcr.io/${{ needs.set_tag_values.outputs.owner_lc }}/kanidm:${{ needs.set_tag_values.outputs.ref_name}}
 
           build-args: |
             "KANIDM_FEATURES="
-          #  "KANIDM_BUILD_OPTIONS=-j1"
           file: tools/Dockerfile
           # Must use OCI exporter for multi-arch: https://github.com/docker/buildx/pull/1813
           outputs: type=oci,dest=/tmp/kanidm-docker.tar
@@ -55,7 +60,7 @@ jobs:
     # This step is split so that we don't apply "packages: write" permission
     # except when uploading the final Docker image to GHCR.
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master' && github.repository == 'kanidm/kanidm'
+    if: ( github.ref_type == 'tag' || github.ref == 'refs/heads/master' ) && github.repository == 'kanidm/kanidm'
     needs: kanidm_build
     permissions:
       packages: write
diff --git a/.github/workflows/docker_build_kanidmd.yml b/.github/workflows/docker_build_kanidmd.yml
index c1256e110..18d8b8a62 100644
--- a/.github/workflows/docker_build_kanidmd.yml
+++ b/.github/workflows/docker_build_kanidmd.yml
@@ -12,22 +12,28 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  set_lower_case_name:
+  set_tag_values:
     runs-on: ubuntu-latest
-    name: set lower case owner name
+    name: Set image tag values
     steps:
       - id: step1
         run: |
           echo "OWNER_LC=${OWNER,,}" >> "${GITHUB_OUTPUT}"
         env:
           OWNER: '${{ github.repository_owner }}'
+      - id: step2
+        run: |
+          echo "REF_NAME=$(echo ${REF_NAME,,} | awk -F/ '{print $1}')" >> "${GITHUB_OUTPUT}"
+        env:
+          REF_NAME: '${{ github.ref_name }}'
     outputs:
       owner_lc: ${{ steps.step1.outputs.OWNER_LC }}
+      ref_name: ${{ steps.step2.outputs.REF_NAME }}
 
   kanidmd_build:
     name: Build kanidmd Docker image
     runs-on: ubuntu-latest
-    needs: set_lower_case_name
+    needs: set_tag_values
     steps:
       - uses: actions/checkout@v4
       - name: Set up Docker Buildx
@@ -54,7 +60,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           platforms: "linux/amd64"
-          tags: ghcr.io/${{ needs.set_lower_case_name.outputs.owner_lc }}/kanidmd:devel
+          tags: ghcr.io/${{ needs.set_tag_values.outputs.owner_lc }}/kanidmd:devel,ghcr.io/${{ needs.set_tag_values.outputs.owner_lc }}/kanidmd:${{ needs.set_tag_values.outputs.ref_name}}
           # build-args: |
           #  "KANIDM_BUILD_OPTIONS=-j1"
           file: server/Dockerfile
@@ -71,7 +77,7 @@ jobs:
     # This step is split so that we don't apply "packages: write" permission
     # except when uploading the final Docker image to GHCR.
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master' && github.repository == 'kanidm/kanidm'
+    if: ( github.ref_type== 'tag' || github.ref == 'refs/heads/master' ) && github.repository == 'kanidm/kanidm'
     needs: kanidmd_build
     permissions:
       packages: write
diff --git a/.github/workflows/docker_build_radiusd.yml b/.github/workflows/docker_build_radiusd.yml
index 0db002f44..45ce04147 100644
--- a/.github/workflows/docker_build_radiusd.yml
+++ b/.github/workflows/docker_build_radiusd.yml
@@ -12,22 +12,28 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  set_lower_case_name:
+  set_tag_values:
     runs-on: ubuntu-latest
-    name: set lower case owner name
+    name: Set image tag values
     steps:
       - id: step1
         run: |
           echo "OWNER_LC=${OWNER,,}" >> "${GITHUB_OUTPUT}"
         env:
           OWNER: '${{ github.repository_owner }}'
+      - id: step2
+        run: |
+          echo "REF_NAME=$(echo ${REF_NAME,,} | awk -F/ '{print $1}')" >> "${GITHUB_OUTPUT}"
+        env:
+          REF_NAME: '${{ github.ref_name }}'
     outputs:
       owner_lc: ${{ steps.step1.outputs.OWNER_LC }}
+      ref_name: ${{ steps.step2.outputs.REF_NAME }}
 
   radius_build:
     name: Build radius Docker image
     runs-on: ubuntu-latest
-    needs: set_lower_case_name
+    needs: set_tag_values
     steps:
       - uses: actions/checkout@v4
       - name: Set up QEMU
@@ -38,7 +44,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           platforms: linux/arm64,linux/amd64
-          tags: ghcr.io/${{ needs.set_lower_case_name.outputs.owner_lc }}/radius:devel
+          tags: ghcr.io/${{ needs.set_tag_values.outputs.owner_lc }}/radius:devel,ghcr.io/${{ needs.set_tag_values.outputs.owner_lc }}/radius:${{ needs.set_tag_values.outputs.ref_name}}
           file: rlm_python/Dockerfile
           # Must use OCI exporter for multi-arch: https://github.com/docker/buildx/pull/1813
           outputs: type=oci,dest=/tmp/radius-docker.tar
@@ -53,7 +59,7 @@ jobs:
     # This step is split so that we don't apply "packages: write" permission
     # except when uploading the final Docker image to GHCR.
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master' && github.repository == 'kanidm/kanidm'
+    if: ( github.ref_type == 'tag' || github.ref == 'refs/heads/master' ) && github.repository == 'kanidm/kanidm'
     needs: radius_build
     permissions:
       packages: write