Skip to content

Commit a95ed84

Browse files
obbardcsjoerdsimons
authored andcommitted
Revert "docker: Install qemu-user-static 6.0 to fix segfault"
This reverts commit 91af617. qemu is no longer in experimental so the container build will now fail. The required patches for qemu have been backported into bullseye so let's revert using qemu from experimental. Link: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=988174 Signed-off-by: Christopher Obbard <[email protected]>
1 parent c66a48d commit a95ed84

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

docker/Dockerfile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ LABEL org.label-schema.docker.cmd 'docker run \
5656

5757
# debos runtime dependencies
5858
# ca-certificates is required to validate HTTPS certificates when getting debootstrap release file
59-
RUN echo "deb http://deb.debian.org/debian experimental main" > /etc/apt/sources.list.d/experimental.list && \
60-
apt-get update && \
59+
RUN apt-get update && \
6160
apt-get install -y --no-install-recommends \
6261
apt-transport-https \
6362
binfmt-support \
@@ -81,6 +80,8 @@ RUN echo "deb http://deb.debian.org/debian experimental main" > /etc/apt/sources
8180
openssh-client \
8281
parted \
8382
pkg-config \
83+
qemu-system-x86 \
84+
qemu-user-static \
8485
rsync \
8586
systemd \
8687
systemd-container \
@@ -90,9 +91,6 @@ RUN echo "deb http://deb.debian.org/debian experimental main" > /etc/apt/sources
9091
xfsprogs \
9192
xz-utils \
9293
zip && \
93-
apt-get install -y --no-install-recommends -t experimental \
94-
qemu-system-x86 \
95-
qemu-user-static && \
9694
rm -rf /var/lib/apt/lists/*
9795

9896
# debian's qemu-user-static package no longer registers binfmts

0 commit comments

Comments
 (0)