From b935a4d1ed3dd5435272142ae52f5b8be67a30a9 Mon Sep 17 00:00:00 2001 From: Christopher Obbard Date: Tue, 5 Dec 2023 11:54:28 +0000 Subject: [PATCH] docker: Install archlinux-keyring from source The arch linux tests require a newer version of archlinux-keyring than what is in Debian stable; so revert back to pulling the latest version. This partially reverts 36cf33366bbe0dd602185a87a241ff070517f868. Signed-off-by: Christopher Obbard --- docker/Dockerfile | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 8231a6f8..173fd7c5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -26,6 +26,24 @@ 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 @@ -89,7 +107,6 @@ RUN apt-get update && \ zip \ makepkg \ pacman-package-manager \ - archlinux-keyring \ arch-install-scripts && \ rm -rf /var/lib/apt/lists/* @@ -101,4 +118,9 @@ 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"]