Skip to content

Commit

Permalink
Revert "docker: Install archlinux-keyring from source"
Browse files Browse the repository at this point in the history
This reverts commit d092c54.
  • Loading branch information
sjoerdsimons committed Feb 25, 2024
1 parent c5738a9 commit e939fee
Showing 1 changed file with 1 addition and 23 deletions.
24 changes: 1 addition & 23 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

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

Expand All @@ -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"]

0 comments on commit e939fee

Please sign in to comment.