workflows: make build matrix and pushed images more consistent

Signed-off-by: John Mulligan <jmulligan@redhat.com>

Author: phlogistonjohn

.github/workflows/container-image.yml

@@ -121,9 +121,6 @@ jobs:
         arch:
           - {name: amd64, host: ubuntu-24.04}
           - {name: arm64, host: ubuntu-24.04-arm}
-        exclude:
-          - os: centos
-            arch: {name: arm64, host: ubuntu-24.04-arm}
     runs-on: ${{ matrix.arch.host }}
     env:
       BUILDAH_FORMAT: oci
@@ -327,7 +324,8 @@ jobs:
           -i samba-ad-server:nightly-fedora-amd64
           -i samba-ad-server:nightly-fedora-arm64
           -i samba-client:default-centos-amd64
-          -i samba-client:default-fedora-arm64
+          -i samba-client:default-centos-arm64
+          -i samba-client:default-fedora-amd64
           -i samba-client:default-fedora-arm64
           -i samba-toolbox:default-fedora-amd64
       - name: Create manifests/indexes
@@ -352,7 +350,8 @@ jobs:
           -i ${REPO_BASE}/samba-ad-server:nightly-fedora-amd64
           -i ${REPO_BASE}/samba-ad-server:nightly-fedora-arm64
           -i ${REPO_BASE}/samba-client:default-centos-amd64
-          -i ${REPO_BASE}/samba-client:default-fedora-arm64
+          -i ${REPO_BASE}/samba-client:default-centos-arm64
+          -i ${REPO_BASE}/samba-client:default-fedora-amd64
           -i ${REPO_BASE}/samba-client:default-fedora-arm64
           -i ${REPO_BASE}/samba-toolbox:default-fedora-amd64
         # Please keep the above list of arguments SORTED.
@@ -385,7 +384,8 @@ jobs:
           -i ${REPO_BASE}/samba-ad-server:nightly-fedora-amd64
           -i ${REPO_BASE}/samba-ad-server:nightly-fedora-arm64
           -i ${REPO_BASE}/samba-client:default-centos-amd64
-          -i ${REPO_BASE}/samba-client:default-fedora-arm64
+          -i ${REPO_BASE}/samba-client:default-centos-arm64
+          -i ${REPO_BASE}/samba-client:default-fedora-amd64
           -i ${REPO_BASE}/samba-client:default-fedora-arm64
           -i ${REPO_BASE}/samba-toolbox:default-fedora-amd64
         # Please keep the above list of arguments SORTED.