From e939feecebdef335ee669060a734ecc25ffc76b8 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Sun, 25 Feb 2024 22:00:20 +0100 Subject: [PATCH] Revert "docker: Install archlinux-keyring from source" This reverts commit d092c5425421afaa42688d3916c3eb71f7556d82. --- docker/Dockerfile | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 626770bb..a3e8a2a0 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 @@ -109,6 +91,7 @@ RUN apt-get update && \ zstd \ makepkg \ pacman-package-manager \ + archlinux-keyring \ arch-install-scripts && \ rm -rf /var/lib/apt/lists/* @@ -120,9 +103,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"]