Skip to content

Commit

Permalink
docker: Install archlinux-keyring from source
Browse files Browse the repository at this point in the history
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 36cf333.

Signed-off-by: Christopher Obbard <[email protected]>
  • Loading branch information
obbardc committed Dec 5, 2023
1 parent 659acaa commit 940890a
Showing 1 changed file with 22 additions and 1 deletion.
23 changes: 22 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,23 @@ COPY . $GOPATH/src/github.com/go-debos/debos
WORKDIR $GOPATH/src/github.com/go-debos/debos/cmd/debos
RUN go install ./...

# Pull the latest archlinux-keyring, since the one in Debian is outdated
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1026080
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 -B latest-release 20221213 && \
make build && \
make PREFIX=/usr KEYRING_TARGET_DIR=/usr/share/keyrings/ DESTDIR=/arch-keyring install

### second stage - runner ###
FROM debian:bookworm-slim as runner

Expand Down Expand Up @@ -89,7 +106,6 @@ RUN apt-get update && \
zip \
makepkg \
pacman-package-manager \
archlinux-keyring \
arch-install-scripts && \
rm -rf /var/lib/apt/lists/*

Expand All @@ -101,4 +117,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

# Pull the latest archlinux-keyring, since the one in Debian is outdated
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1026080
# WARNING: removing this will most likely break archlinux support
COPY --from=builder /arch-keyring/ /

ENTRYPOINT ["/usr/local/bin/debos"]

0 comments on commit 940890a

Please sign in to comment.