It's always multiarch containers(when available)

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
saltstack · Nov 24, 2023 · db42b9c · db42b9c
1 parent 74ee941
commit db42b9c
Show file tree

Hide file tree

Showing 31 changed files with 82 additions and 87 deletions.
diff --git a/.github/workflows/.container.template.j2 b/.github/workflows/.container.template.j2
@@ -52,26 +52,22 @@ jobs:
         run: |
           python -m pip install -r requirements.txt
 
-      <%- if multiarch %>
-
       - name: "Docker QEMU"
         uses: docker/setup-qemu-action@v3
 
       - name: "Docker BuildX"
         id: buildx
         uses: docker/setup-buildx-action@v3
 
-      <%- endif %>
-
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}<%- if multiarch %> --multiarch<%- endif %>
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
   mirror-image:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }}<%- if multiarch %> (${{ matrix.dockerinfo.platform }})<%- endif %>"
+    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10
@@ -140,9 +136,7 @@ jobs:
         with:
           file: ${{ matrix.dockerinfo.file }}
           context: ${{ env.PATH_IN_REPO }}
-<%- if multiarch %>
           platforms: ${{ matrix.dockerinfo.platform }}
-<%- endif %>
           push: ${{ github.repository == 'saltstack/salt-ci-containers' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' ) }}
           tags: |
             ghcr.io/${{ github.repository }}/${{ matrix.dockerinfo.name }}
diff --git a/.github/workflows/almalinux-containers.yml b/.github/workflows/almalinux-containers.yml
@@ -62,12 +62,12 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
   mirror-image:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }} (${{ matrix.dockerinfo.platform }})"
+    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10

diff --git a/.github/workflows/amazonlinux-containers.yml b/.github/workflows/amazonlinux-containers.yml
@@ -62,12 +62,12 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
   mirror-image:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }} (${{ matrix.dockerinfo.platform }})"
+    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10

diff --git a/.github/workflows/archlinux-containers.yml b/.github/workflows/archlinux-containers.yml
@@ -62,12 +62,12 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
   mirror-image:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }} (${{ matrix.dockerinfo.platform }})"
+    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10

diff --git a/.github/workflows/busybox-containers.yml b/.github/workflows/busybox-containers.yml
@@ -62,12 +62,12 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
   mirror-image:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }} (${{ matrix.dockerinfo.platform }})"
+    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10

diff --git a/.github/workflows/centos-containers.yml b/.github/workflows/centos-containers.yml
@@ -62,12 +62,12 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
   mirror-image:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }} (${{ matrix.dockerinfo.platform }})"
+    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10

diff --git a/.github/workflows/centos-stream-containers.yml b/.github/workflows/centos-stream-containers.yml
@@ -62,12 +62,12 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
   mirror-image:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }} (${{ matrix.dockerinfo.platform }})"
+    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10

diff --git a/.github/workflows/consul-containers.yml b/.github/workflows/consul-containers.yml
@@ -62,12 +62,12 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
   mirror-image:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }} (${{ matrix.dockerinfo.platform }})"
+    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10

diff --git a/.github/workflows/debian-containers.yml b/.github/workflows/debian-containers.yml
@@ -62,12 +62,12 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
   mirror-image:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }} (${{ matrix.dockerinfo.platform }})"
+    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10

diff --git a/.github/workflows/etcd-v2-containers.yml b/.github/workflows/etcd-v2-containers.yml
@@ -62,12 +62,12 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
   mirror-image:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }} (${{ matrix.dockerinfo.platform }})"
+    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10

diff --git a/.github/workflows/etcd-v3-containers.yml b/.github/workflows/etcd-v3-containers.yml
@@ -62,12 +62,12 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
   mirror-image:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }} (${{ matrix.dockerinfo.platform }})"
+    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10

diff --git a/.github/workflows/fedora-containers.yml b/.github/workflows/fedora-containers.yml
@@ -62,12 +62,12 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
   mirror-image:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }} (${{ matrix.dockerinfo.platform }})"
+    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10

diff --git a/.github/workflows/mariadb-containers.yml b/.github/workflows/mariadb-containers.yml
@@ -62,12 +62,12 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
   mirror-image:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }} (${{ matrix.dockerinfo.platform }})"
+    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10

diff --git a/.github/workflows/mysql-server-containers.yml b/.github/workflows/mysql-server-containers.yml
@@ -62,12 +62,12 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
   mirror-image:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }} (${{ matrix.dockerinfo.platform }})"
+    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10

diff --git a/.github/workflows/openldap-minion-containers.yml b/.github/workflows/openldap-minion-containers.yml
@@ -62,12 +62,12 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
   mirror-image:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }} (${{ matrix.dockerinfo.platform }})"
+    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10

diff --git a/.github/workflows/opensuse-containers.yml b/.github/workflows/opensuse-containers.yml
@@ -62,12 +62,12 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
   mirror-image:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }} (${{ matrix.dockerinfo.platform }})"
+    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10

diff --git a/.github/workflows/packaging-containers.yml b/.github/workflows/packaging-containers.yml
@@ -62,12 +62,12 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
   mirror-image:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }} (${{ matrix.dockerinfo.platform }})"
+    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10

diff --git a/.github/workflows/percona-containers.yml b/.github/workflows/percona-containers.yml
@@ -62,12 +62,12 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
   mirror-image:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }} (${{ matrix.dockerinfo.platform }})"
+    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10

diff --git a/.github/workflows/photon-containers.yml b/.github/workflows/photon-containers.yml
@@ -62,12 +62,12 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
   mirror-image:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }} (${{ matrix.dockerinfo.platform }})"
+    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10

diff --git a/.github/workflows/python-containers.yml b/.github/workflows/python-containers.yml
@@ -62,12 +62,12 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
   mirror-image:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }} (${{ matrix.dockerinfo.platform }})"
+    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10

diff --git a/.github/workflows/rabbitmq-containers.yml b/.github/workflows/rabbitmq-containers.yml
@@ -62,12 +62,12 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
   mirror-image:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }} (${{ matrix.dockerinfo.platform }})"
+    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10

diff --git a/.github/workflows/redis-containers.yml b/.github/workflows/redis-containers.yml
@@ -62,12 +62,12 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
   mirror-image:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }} (${{ matrix.dockerinfo.platform }})"
+    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10

diff --git a/.github/workflows/salt-containers.yml b/.github/workflows/salt-containers.yml
@@ -62,12 +62,12 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
   mirror-image:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }} (${{ matrix.dockerinfo.platform }})"
+    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10

diff --git a/.github/workflows/salt-gitfs-http-containers.yml b/.github/workflows/salt-gitfs-http-containers.yml
@@ -62,12 +62,12 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
   mirror-image:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }} (${{ matrix.dockerinfo.platform }})"
+    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10

diff --git a/.github/workflows/ssh-minion-containers.yml b/.github/workflows/ssh-minion-containers.yml
@@ -62,12 +62,12 @@ jobs:
       - name: "Generate Matrix Data"
         id: set-matrix
         run: |
-          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }} --multiarch
+          inv containers.matrix --from-workflow ${{ env.PATH_IN_REPO }}
 
   mirror-image:
     runs-on: ubuntu-latest
     needs: matrix-generator
-    name: "${{ matrix.dockerinfo.name }} (${{ matrix.dockerinfo.platform }})"
+    name: "${{ matrix.dockerinfo.name }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     strategy:
       fail-fast: false
       max-parallel: 10