aboutsummaryrefslogtreecommitdiff
path: root/tests/docker/dockerfiles
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2022-09-14 16:59:29 +0100
committerAlex Bennée <alex.bennee@linaro.org>2022-09-20 16:27:12 +0100
commit8b034187607f5b9c153b4b42ed45ee0b9b4c9881 (patch)
treecd521ed6817704c5f552bc44c1b802906749439c /tests/docker/dockerfiles
parentd9df358f53494d121f569abe2e5a0888731315c4 (diff)
downloadqemu-8b034187607f5b9c153b4b42ed45ee0b9b4c9881.zip
qemu-8b034187607f5b9c153b4b42ed45ee0b9b4c9881.tar.gz
qemu-8b034187607f5b9c153b4b42ed45ee0b9b4c9881.tar.bz2
tests/docker: update and flatten debian-hppa-cross
Update to the latest stable Debian. While we are at it flatten into a single dockerfile. We really don't need the rest of the stuff from the QEMU base image just to compile test images. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-Id: <20220914155950.804707-10-alex.bennee@linaro.org>
Diffstat (limited to 'tests/docker/dockerfiles')
-rw-r--r--tests/docker/dockerfiles/debian-hppa-cross.docker12
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/docker/dockerfiles/debian-hppa-cross.docker b/tests/docker/dockerfiles/debian-hppa-cross.docker
index 3d6c65a..af1c840 100644
--- a/tests/docker/dockerfiles/debian-hppa-cross.docker
+++ b/tests/docker/dockerfiles/debian-hppa-cross.docker
@@ -1,12 +1,14 @@
#
# Docker cross-compiler target
#
-# This docker target builds on the debian Buster base image.
+# This docker target builds on the Debian Bullseye base image.
#
-FROM qemu/debian10
+FROM docker.io/library/debian:11-slim
-RUN apt update && \
- DEBIAN_FRONTEND=noninteractive eatmydata \
- apt install -y --no-install-recommends \
+RUN export DEBIAN_FRONTEND=noninteractive && \
+ apt-get update && \
+ apt-get install -y eatmydata && \
+ eatmydata apt-get dist-upgrade -y && \
+ eatmydata apt-get install --no-install-recommends -y \
gcc-hppa-linux-gnu \
libc6-dev-hppa-cross