mirror of
https://github.com/outbackdingo/debos.git
synced 2026-01-27 18:18:45 +00:00
docker: update to Debian 12 (Bookworm)
Update parent image to bookworm. This allows us to remove all the backports and also to build Ubuntu images again as it requires dpkg zstd support. Signed-off-by: Klaus Goger <klaus.goger@theobroma-systems.com>
This commit is contained in:
committed by
Sjoerd Simons
parent
eab775956e
commit
36cf33366b
@@ -3,7 +3,7 @@ ARG DEBIAN_FRONTEND=noninteractive
|
||||
ARG GOPATH=/usr/local/go
|
||||
|
||||
### first stage - builder ###
|
||||
FROM debian:bullseye-slim as builder
|
||||
FROM debian:bookworm-slim as builder
|
||||
|
||||
ARG DEBIAN_FRONTEND
|
||||
ARG GOPATH
|
||||
@@ -26,24 +26,8 @@ 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 && \
|
||||
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:bullseye-slim as runner
|
||||
FROM debian:bookworm-slim as runner
|
||||
|
||||
ARG DEBIAN_FRONTEND
|
||||
ARG GOPATH
|
||||
@@ -96,26 +80,16 @@ RUN apt-get update && \
|
||||
rsync \
|
||||
systemd \
|
||||
systemd-container \
|
||||
systemd-resolved \
|
||||
u-boot-tools \
|
||||
unzip \
|
||||
user-mode-linux \
|
||||
xfsprogs \
|
||||
xz-utils \
|
||||
zip && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Enable backports for the Arch dependencies
|
||||
RUN echo "deb http://ftp.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list
|
||||
|
||||
# NOTE: Explicitly install arch-install-scripts from backports. The normal one
|
||||
# lacks pactrap.
|
||||
# Install Arch dependencies
|
||||
RUN apt-get update && \
|
||||
apt-get install -y --no-install-recommends \
|
||||
zip \
|
||||
makepkg \
|
||||
pacman-package-manager && \
|
||||
apt-get install -y --no-install-recommends \
|
||||
-t bullseye-backports \
|
||||
pacman-package-manager \
|
||||
archlinux-keyring \
|
||||
arch-install-scripts && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
@@ -127,8 +101,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
|
||||
|
||||
# Pull the latest archlinux-keyring, since the one in Debian is outdated
|
||||
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1026080
|
||||
COPY --from=builder /arch-keyring/ /
|
||||
|
||||
ENTRYPOINT ["/usr/local/bin/debos"]
|
||||
|
||||
Reference in New Issue
Block a user