From 0859d23b2b48804dcc2a247b79381c09f5d1874b Mon Sep 17 00:00:00 2001
From: Dave Conroy <dave@tiredofit.ca>
Date: Sat, 7 Dec 2024 08:32:47 -0800
Subject: [PATCH] Update workflows

---
 .github/workflows/main.yml   | 107 ++++++++++++++++++++++++++++++++++
 .github/workflows/manual.yml | 108 +++++++++++++++++++++++++++++++++++
 2 files changed, 215 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6d5aa9b..50e39cc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -118,6 +118,113 @@ jobs:
           build-args: |
              ALPINE_VERSION=${{ env.DISTRO_VARIANT }}
 
+  v3_21:
+    env:
+      DISTRO_VARIANT: "3.21"
+      build_file: Dockerfile
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Prepare
+        id: prep
+        run: |
+          if [[ "${GITHUB_REF}" == refs/heads/* ]]; then
+              if [[ "${GITHUB_REF}" == refs/heads/*/* ]] ; then
+                  git_branch="${GITHUB_REPOSITORY/docker-/}:$(echo $GITHUB_REF | sed "s|refs/heads/||g" | sed "s|/|-|g")"
+              else
+                  git_branch=${GITHUB_REF#refs/heads/}
+              fi
+
+              case "${git_branch}" in
+                  "main" | "master" )
+                      if [ "${{ vars.LATEST }}" = "TRUE" ] || [ "${{ vars.LATEST }}" = "${DISTRO_VARIANT}" ]; then
+                          image_latest=",${GITHUB_REPOSITORY}:latest"
+                      fi
+                      branch_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT},${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-latest${image_latest}"
+                  ;;
+                  "develop" )
+                      branch_tag="${GITHUB_REPOSITORY}:develop"
+                  ;;
+              esac
+          fi
+
+          if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
+              git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')"
+          fi
+
+          if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then
+              image_tags=${branch_tag},${git_tag}
+          else
+              image_tags="${branch_tag}${git_tag}"
+          fi
+
+          echo "dockerhub_repo=${GITHUB_REPOSITORY/docker-/}" >> $GITHUB_ENV
+          dockerhub_images=$(echo "${image_tags}" | sed "s|${GITHUB_REPOSITORY}|docker.io/${GITHUB_REPOSITORY/docker-/}|g")
+          ghcr_images=$(echo "${image_tags}" | sed "s|${GITHUB_REPOSITORY}|ghcr.io/${GITHUB_REPOSITORY}|g")
+          echo "container_images=${dockerhub_images},${ghcr_images}" >> $GITHUB_OUTPUT
+      - name: Label
+        id: Label
+        run: |
+          image_name=${GITHUB_REPOSITORY/docker-/}
+          if [ -f "${{ env.build_file }}" ] ; then
+              sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_repository=\"https://github.com/${GITHUB_REPOSITORY}\"" ${{ env.build_file }}
+              sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_commit=\"${GITHUB_SHA}\"" ${{ env.build_file }}
+              sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_committed_by=\"${GITHUB_ACTOR}\"" ${{ env.build_file }}
+              sed -i "/FROM .*/a LABEL tiredofit.${image_name}.image_build_date=\"$(date +'%Y-%m-%d %H:%M:%S')\"" ${{ env.build_file }}
+              sed -i "/FROM .*/a LABEL org.opencontainers.image.source https://github.com/${GITHUB_REPOSITORY}"  ${{ env.build_file }}
+
+              if [ -f "CHANGELOG.md" ] ; then
+                  sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_changelog_version=\"$(head -n1 ./CHANGELOG.md | awk '{print $2}')\"" ${{ env.build_file }}
+                  mkdir -p install/assets/.changelogs ; cp CHANGELOG.md install/assets/.changelogs/${GITHUB_REPOSITORY/\//_}.md
+              fi
+
+              if [[ $GITHUB_REF == refs/tags/* ]]; then
+                  sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_tag=\"${GITHUB_REF#refs/tags/v}\"" ${{ env.build_file }}
+              fi
+
+              if [[ $GITHUB_REF == refs/heads/* ]]; then
+                  sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_branch=\"${GITHUB_REF#refs/heads/}\"" ${{ env.build_file }}
+              fi
+          fi
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: arm,arm64
+
+      - name: Login to DockerHub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build
+        if: github.event_name != 'pull_request'
+        uses: docker/build-push-action@v6
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          context: .
+          file: ./${{ env.build_file }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: true
+          tags: ${{ steps.prep.outputs.container_images }}
+          build-args: |
+             ALPINE_VERSION=${{ env.DISTRO_VARIANT }}
+
 ###
   v3_19:
     env:
diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
index c8e3433..16f775a 100644
--- a/.github/workflows/manual.yml
+++ b/.github/workflows/manual.yml
@@ -119,6 +119,114 @@ jobs:
              ALPINE_VERSION=${{ env.DISTRO_VARIANT }}
 
 ###
+  v3_21:
+    env:
+      DISTRO_VARIANT: "3.21"
+      build_file: Dockerfile
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Prepare
+        id: prep
+        run: |
+          if [[ "${GITHUB_REF}" == refs/heads/* ]]; then
+              if [[ "${GITHUB_REF}" == refs/heads/*/* ]] ; then
+                  git_branch="${GITHUB_REPOSITORY/docker-/}:$(echo $GITHUB_REF | sed "s|refs/heads/||g" | sed "s|/|-|g")"
+              else
+                  git_branch=${GITHUB_REF#refs/heads/}
+              fi
+
+              case "${git_branch}" in
+                  "main" | "master" )
+                      if [ "${{ vars.LATEST }}" = "TRUE" ] || [ "${{ vars.LATEST }}" = "${DISTRO_VARIANT}" ]; then
+                          image_latest=",${GITHUB_REPOSITORY}:latest"
+                      fi
+                      branch_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT},${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-latest${image_latest}"
+                  ;;
+                  "develop" )
+                      branch_tag="${GITHUB_REPOSITORY}:develop"
+                  ;;
+              esac
+          fi
+
+          if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
+              git_tag="${GITHUB_REPOSITORY}:${DISTRO_VARIANT}-$(echo ${GITHUB_REF} | sed 's|refs/tags/||g')"
+          fi
+
+          if [ -n "${branch_tag}" ] && [ -n "${git_tag}" ]; then
+              image_tags=${branch_tag},${git_tag}
+          else
+              image_tags="${branch_tag}${git_tag}"
+          fi
+
+          echo "dockerhub_repo=${GITHUB_REPOSITORY/docker-/}" >> $GITHUB_ENV
+          dockerhub_images=$(echo "${image_tags}" | sed "s|${GITHUB_REPOSITORY}|docker.io/${GITHUB_REPOSITORY/docker-/}|g")
+          ghcr_images=$(echo "${image_tags}" | sed "s|${GITHUB_REPOSITORY}|ghcr.io/${GITHUB_REPOSITORY}|g")
+          echo "container_images=${dockerhub_images},${ghcr_images}" >> $GITHUB_OUTPUT
+      - name: Label
+        id: Label
+        run: |
+          image_name=${GITHUB_REPOSITORY/docker-/}
+          if [ -f "${{ env.build_file }}" ] ; then
+              sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_repository=\"https://github.com/${GITHUB_REPOSITORY}\"" ${{ env.build_file }}
+              sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_commit=\"${GITHUB_SHA}\"" ${{ env.build_file }}
+              sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_committed_by=\"${GITHUB_ACTOR}\"" ${{ env.build_file }}
+              sed -i "/FROM .*/a LABEL tiredofit.${image_name}.image_build_date=\"$(date +'%Y-%m-%d %H:%M:%S')\"" ${{ env.build_file }}
+              sed -i "/FROM .*/a LABEL org.opencontainers.image.source https://github.com/${GITHUB_REPOSITORY}"  ${{ env.build_file }}
+
+              if [ -f "CHANGELOG.md" ] ; then
+                  sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_changelog_version=\"$(head -n1 ./CHANGELOG.md | awk '{print $2}')\"" ${{ env.build_file }}
+                  mkdir -p install/assets/.changelogs ; cp CHANGELOG.md install/assets/.changelogs/${GITHUB_REPOSITORY/\//_}.md
+              fi
+
+              if [[ $GITHUB_REF == refs/tags/* ]]; then
+                  sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_tag=\"${GITHUB_REF#refs/tags/v}\"" ${{ env.build_file }}
+              fi
+
+              if [[ $GITHUB_REF == refs/heads/* ]]; then
+                  sed -i "/FROM .*/a LABEL tiredofit.${image_name}.git_branch=\"${GITHUB_REF#refs/heads/}\"" ${{ env.build_file }}
+              fi
+          fi
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: arm,arm64
+
+      - name: Login to DockerHub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Login to GitHub Container Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build
+        if: github.event_name != 'pull_request'
+        uses: docker/build-push-action@v6
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          context: .
+          file: ./${{ env.build_file }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: true
+          tags: ${{ steps.prep.outputs.container_images }}
+          build-args: |
+             ALPINE_VERSION=${{ env.DISTRO_VARIANT }}
+
+
   v3_20:
     env:
       DISTRO_VARIANT: "3.20"