diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7d08dd20..88f6b76e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -138,8 +138,9 @@ jobs: test: { name: "debian (arm64)", case: "debian", variables: "-t architecture:arm64" } - backend: kvm test: { name: "debian (armhf)", case: "debian", variables: "-t architecture:armhf" } - - backend: kvm - test: { name: "arch", case: "arch" } + # TODO Arch tests are disabled; waiting for https://github.com/go-debos/debos/issues/483 + #- backend: kvm + # test: { name: "arch", case: "arch" } - backend: kvm test: { name: "apertis", case: "apertis" } name: ${{matrix.test.name}} on ${{matrix.backend}} diff --git a/docker/Dockerfile b/docker/Dockerfile index 313d054f..bbc610f4 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -26,24 +26,6 @@ COPY . $GOPATH/src/github.com/go-debos/debos WORKDIR $GOPATH/src/github.com/go-debos/debos/cmd/debos RUN go install ./... -# Install the latest archlinux-keyring, since the one in Debian is bound -# to get outdated sooner or later. -# WARNING: returning to the debian package will break the pacstrap action -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - pkgconf \ - python3-all \ - sq \ - systemd \ - make && \ - rm -rf /var/lib/apt/lists/* - -RUN git clone https://gitlab.archlinux.org/archlinux/archlinux-keyring && \ - cd archlinux-keyring && \ - git checkout master && \ - make build && \ - make PREFIX=/usr KEYRING_TARGET_DIR=/usr/share/keyrings/ DESTDIR=/arch-keyring install - ### second stage - runner ### FROM debian:bookworm-slim as runner @@ -92,7 +74,6 @@ RUN apt-get update && \ linux-image-amd64 \ openssh-client \ parted \ - pkg-config \ qemu-system-x86 \ qemu-user-static \ qemu-utils \ @@ -105,10 +86,7 @@ RUN apt-get update && \ user-mode-linux \ xfsprogs \ xz-utils \ - zip \ - makepkg \ - pacman-package-manager \ - arch-install-scripts && \ + zip && \ rm -rf /var/lib/apt/lists/* # debian's qemu-user-static package no longer registers binfmts @@ -119,9 +97,4 @@ RUN for arch in aarch64 alpha arm armeb cris hexagon hppa m68k microblaze mips m COPY --from=builder $GOPATH/bin/debos /usr/local/bin/debos -# Install the latest archlinux-keyring, since the one in Debian is bound -# to get outdated sooner or later. -# WARNING: returning to the debian package will break the pacstrap action -COPY --from=builder /arch-keyring/usr/share/keyrings /usr/share/keyrings - ENTRYPOINT ["/usr/local/bin/debos"]