From 51d8a096dd41a214af86781923db11438f86c06b Mon Sep 17 00:00:00 2001
From: Leonard Jonathan Oh <leonardjonathanoh@live.com>
Date: Mon, 2 Jan 2023 19:37:02 +0000
Subject: [PATCH] Enhancement: Build multi-arch images

---
 .github/workflows/ci-master-pr.yml | 156 ++++++++++++++---------------
 generate/definitions/VARIANTS.ps1  |   2 +-
 2 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/.github/workflows/ci-master-pr.yml b/.github/workflows/ci-master-pr.yml
index 9c3af412..4a36f892 100644
--- a/.github/workflows/ci-master-pr.yml
+++ b/.github/workflows/ci-master-pr.yml
@@ -103,7 +103,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.11.0-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -123,7 +123,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.11.0-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -142,7 +142,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.11.0-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
@@ -228,7 +228,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.11.0-docker-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -249,7 +249,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.11.0-docker-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -269,7 +269,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.11.0-docker-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
@@ -355,7 +355,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.11.0-docker-rootless-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -376,7 +376,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.11.0-docker-rootless-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -396,7 +396,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.11.0-docker-rootless-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
@@ -482,7 +482,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.10.1-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -502,7 +502,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.10.1-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -521,7 +521,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.10.1-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
@@ -606,7 +606,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.10.1-docker-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -627,7 +627,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.10.1-docker-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -647,7 +647,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.10.1-docker-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
@@ -733,7 +733,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.10.1-docker-rootless-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -754,7 +754,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.10.1-docker-rootless-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -774,7 +774,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.10.1-docker-rootless-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
@@ -860,7 +860,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.9.1-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -880,7 +880,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.9.1-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -899,7 +899,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.9.1-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
@@ -984,7 +984,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.9.1-docker-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -1005,7 +1005,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.9.1-docker-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -1025,7 +1025,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.9.1-docker-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
@@ -1111,7 +1111,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.9.1-docker-rootless-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -1132,7 +1132,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.9.1-docker-rootless-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -1152,7 +1152,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.9.1-docker-rootless-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
@@ -1238,7 +1238,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -1258,7 +1258,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -1277,7 +1277,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
@@ -1362,7 +1362,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -1383,7 +1383,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -1403,7 +1403,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
@@ -1489,7 +1489,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-go-1.17.13-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -1510,7 +1510,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-go-1.17.13-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -1530,7 +1530,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-go-1.17.13-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
@@ -1616,7 +1616,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-go-1.18.10-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -1637,7 +1637,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-go-1.18.10-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -1657,7 +1657,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-go-1.18.10-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
@@ -1743,7 +1743,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-go-1.19.7-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -1764,7 +1764,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-go-1.19.7-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -1784,7 +1784,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-go-1.19.7-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
@@ -1870,7 +1870,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-go-1.20.2-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -1891,7 +1891,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-go-1.20.2-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -1911,7 +1911,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-go-1.20.2-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
@@ -1997,7 +1997,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-rootless-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -2018,7 +2018,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-rootless-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -2038,7 +2038,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-rootless-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
@@ -2124,7 +2124,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-rootless-go-1.17.13-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -2145,7 +2145,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-rootless-go-1.17.13-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -2165,7 +2165,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-rootless-go-1.17.13-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
@@ -2251,7 +2251,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-rootless-go-1.18.10-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -2272,7 +2272,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-rootless-go-1.18.10-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -2292,7 +2292,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-rootless-go-1.18.10-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
@@ -2378,7 +2378,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-rootless-go-1.19.7-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -2399,7 +2399,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-rootless-go-1.19.7-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -2419,7 +2419,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-rootless-go-1.19.7-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
@@ -2505,7 +2505,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-rootless-go-1.20.2-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -2526,7 +2526,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-rootless-go-1.20.2-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -2546,7 +2546,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.8.3-docker-rootless-go-1.20.2-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
@@ -2632,7 +2632,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.7.1-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -2652,7 +2652,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.7.1-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -2671,7 +2671,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.7.1-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
@@ -2756,7 +2756,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.7.1-docker-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -2777,7 +2777,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.7.1-docker-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -2797,7 +2797,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.7.1-docker-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
@@ -2883,7 +2883,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.7.1-docker-rootless-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -2904,7 +2904,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.7.1-docker-rootless-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -2924,7 +2924,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.7.1-docker-rootless-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
@@ -3010,7 +3010,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.6.1-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -3030,7 +3030,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.6.1-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -3049,7 +3049,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.6.1-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
@@ -3134,7 +3134,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.6.1-docker-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -3155,7 +3155,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.6.1-docker-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -3175,7 +3175,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.6.1-docker-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
@@ -3261,7 +3261,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.6.1-docker-rootless-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -3282,7 +3282,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.6.1-docker-rootless-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.REF_VARIANT }}
@@ -3302,7 +3302,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         context: variants/v4.6.1-docker-rootless-alpine-3.15
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
           ${{ github.repository }}:${{ env.VARIANT }}
diff --git a/generate/definitions/VARIANTS.ps1 b/generate/definitions/VARIANTS.ps1
index 5e43e818..946622f2 100755
--- a/generate/definitions/VARIANTS.ps1
+++ b/generate/definitions/VARIANTS.ps1
@@ -114,7 +114,7 @@ $VARIANTS = @(
                             $variant['distro_version']
                         ) -join '-'
                     }
-                    platforms = 'linux/amd64'
+                    platforms ='linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64'
                     components = $subVariant['components']
                 }
                 # Docker image tag. E.g. 'v2.3.0-alpine-3.6'