diff --git a/.github/workflows/container-image.yml b/.github/workflows/container-image.yml index 1affbee..94e6f28 100644 --- a/.github/workflows/container-image.yml +++ b/.github/workflows/container-image.yml @@ -54,6 +54,9 @@ jobs: - package_source: devbuilds os: centos arch: amd64 + - package_source: default + os: fedora + arch: arm64 runs-on: ubuntu-latest env: BUILDAH_FORMAT: oci @@ -82,6 +85,10 @@ jobs: # the distro packages for centos do not include an ad-dc - package_source: default os: centos + include: + - package_source: default + os: fedora + arch: arm64 runs-on: ubuntu-latest env: BUILDAH_FORMAT: oci @@ -102,6 +109,10 @@ jobs: matrix: os: [centos, fedora, opensuse] arch: [amd64] + include: + - package_source: default + os: fedora + arch: arm64 runs-on: ubuntu-latest env: BUILDAH_FORMAT: oci @@ -250,6 +261,11 @@ jobs: with: image: "samba-server:default-fedora-amd64" container_engine: ${{ env.CONTAINER_CMD }} + - name: Fetch server default-fedora-arm64 + uses: ishworkh/container-image-artifact-download@v2.0.0 + with: + image: "samba-server:default-fedora-arm64" + container_engine: ${{ env.CONTAINER_CMD }} - name: Fetch server nightly-fedora-amd64 uses: ishworkh/container-image-artifact-download@v2.0.0 with: @@ -271,6 +287,11 @@ jobs: with: image: "samba-ad-server:default-fedora-amd64" container_engine: ${{ env.CONTAINER_CMD }} + - name: Fetch ad-server default-fedora-arm64 + uses: ishworkh/container-image-artifact-download@v2.0.0 + with: + image: "samba-ad-server:default-fedora-arm64" + container_engine: ${{ env.CONTAINER_CMD }} - name: Fetch ad-server nightly-fedora-amd64 uses: ishworkh/container-image-artifact-download@v2.0.0 with: @@ -282,12 +303,22 @@ jobs: with: image: "samba-client:default-fedora-amd64" container_engine: ${{ env.CONTAINER_CMD }} + - name: Fetch client default-fedora-arm64 + uses: ishworkh/container-image-artifact-download@v2.0.0 + with: + image: "samba-client:default-fedora-arm64" + container_engine: ${{ env.CONTAINER_CMD }} # (toolbox images) - name: Fetch toolbox default-fedora-amd64 uses: ishworkh/container-image-artifact-download@v2.0.0 with: image: "samba-toolbox:default-fedora-amd64" container_engine: ${{ env.CONTAINER_CMD }} + - name: Fetch toolbox default-fedora-arm64 + uses: ishworkh/container-image-artifact-download@v2.0.0 + with: + image: "samba-toolbox:default-fedora-arm64" + container_engine: ${{ env.CONTAINER_CMD }} # reapply missing tags - name: Retag images run: > @@ -297,13 +328,17 @@ jobs: --repo-base=${REPO_BASE} --no-distro-qualified -i samba-server:default-fedora-amd64 + -i samba-server:default-fedora-arm64 -i samba-server:nightly-fedora-amd64 -i samba-server:nightly-centos-amd64 -i samba-server:devbuilds-centos-amd64 -i samba-ad-server:default-fedora-amd64 + -i samba-ad-server:default-fedora-arm64 -i samba-ad-server:nightly-fedora-amd64 -i samba-client:default-fedora-amd64 + -i samba-client:default-fedora-arm64 -i samba-toolbox:default-fedora-amd64 + -i samba-toolbox:default-fedora-arm64 - name: Push images run: > ./hack/build-image @@ -313,10 +348,14 @@ jobs: --push-state=exists --push-selected-tags=mixed -i ${REPO_BASE}/samba-server:default-fedora-amd64 + -i ${REPO_BASE}/samba-server:default-fedora-arm64 -i ${REPO_BASE}/samba-server:nightly-fedora-amd64 -i ${REPO_BASE}/samba-server:nightly-centos-amd64 -i ${REPO_BASE}/samba-server:devbuilds-centos-amd64 -i ${REPO_BASE}/samba-ad-server:default-fedora-amd64 + -i ${REPO_BASE}/samba-ad-server:default-fedora-arm64 -i ${REPO_BASE}/samba-ad-server:nightly-fedora-amd64 -i ${REPO_BASE}/samba-client:default-fedora-amd64 + -i ${REPO_BASE}/samba-client:default-fedora-arm64 -i ${REPO_BASE}/samba-toolbox:default-fedora-amd64 + -i ${REPO_BASE}/samba-toolbox:default-fedora-arm64