diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2022-09-14 16:59:30 +0100 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2022-09-20 16:27:17 +0100 |
| commit | 77855002369b80d7d31cb85952c2149f7f3f2624 (patch) | |
| tree | 69ddc961a7e61508d30ac757ca8ac0f4a3b5878a /tests/docker | |
| parent | 8b034187607f5b9c153b4b42ed45ee0b9b4c9881 (diff) | |
tests/docker: update and flatten debian-m68k-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-11-alex.bennee@linaro.org>
Diffstat (limited to 'tests/docker')
| -rw-r--r-- | tests/docker/Makefile.include | 1 | ||||
| -rw-r--r-- | tests/docker/dockerfiles/debian-m68k-cross.docker | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index e39597d35c..95790e974e 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -88,7 +88,6 @@ DOCKER_PARTIAL_IMAGES += debian-s390x-cross DOCKER_PARTIAL_IMAGES += fedora endif -docker-image-debian-m68k-cross: docker-image-debian10 docker-image-debian-mips-cross: docker-image-debian10 docker-image-debian-mips64-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-m68k-cross.docker b/tests/docker/dockerfiles/debian-m68k-cross.docker index fcb10e3534..dded71c5d2 100644 --- a/tests/docker/dockerfiles/debian-m68k-cross.docker +++ b/tests/docker/dockerfiles/debian-m68k-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-m68k-linux-gnu \ libc6-dev-m68k-cross |