Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/build-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@ jobs:
variant:
- base/base-docker-x86_64
- base/base-docker-aarch64
- base/base-docker-riscv64

outputs:
artifact: ${{ matrix.variant }}
# ubuntu-latest unless we're building aarch64
runs-on: ${{ endsWith(matrix.variant, '-aarch64') && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
runs-on: ${{ endsWith(matrix.variant, '-aarch64') && 'ubuntu-24.04-arm' || endsWith(matrix.variant, '-riscv64') && 'banana-pi-f3' || 'ubuntu-latest' }}
container:
image: ghcr.io/fyralabs/katsu:v0.10.2
# Pass /dev from host to container
Expand All @@ -34,7 +35,6 @@ jobs:
options: --privileged -v /dev:/dev

steps:

- name: Checkout
uses: actions/checkout@v4

Expand All @@ -56,6 +56,8 @@ jobs:
host_arch="amd64"
elif [ ${{ env.arch }} == "aarch64" ]; then
host_arch="arm64"
elif [ ${{ env.arch }} == "riscv64" ]; then
host_arch="riscv64"
fi

# tarball katsu-work/chroot then import using podman with tag ghcr.io/ultramarine-linux/ultramarine:43
Expand Down Expand Up @@ -101,6 +103,7 @@ jobs:
buildah manifest create $MANIFEST
buildah manifest add $MANIFEST oci-archive:base-base-docker-x86_64-docker/katsu.tar.xz --arch amd64
buildah manifest add $MANIFEST oci-archive:base-base-docker-aarch64-docker/katsu.tar.xz --arch arm64
buildah manifest add $MANIFEST oci-archive:base-base-docker-riscv64-docker/katsu.tar.xz --arch riscv64
# also tag as latest
buildah tag $MANIFEST $MANIFEST:latest || :
buildah manifest push --all --format v2s2 $MANIFEST docker://$MANIFEST:$RELEASE
Expand Down Expand Up @@ -141,7 +144,7 @@ jobs:
with:
context: .
file: ${{ matrix.docker.dockerfile }}
platforms: linux/amd64,linux/arm64
platforms: linux/amd64,linux/arm64,linux/riscv64
push: true
tags: |
${{ matrix.docker.image }}:${{ matrix.version }}
Expand Down
Loading