[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 26/30] tests/docker: update and flatten debian-loongarch-cross
From: |
Alex Bennée |
Subject: |
[PULL 26/30] tests/docker: update and flatten debian-loongarch-cross |
Date: |
Tue, 20 Sep 2022 18:15:29 +0100 |
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. In this case it is a
binary distribution of the toolchain anyway.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220914155950.804707-27-alex.bennee@linaro.org>
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index a0f5109628..1d5a6f1fb4 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -128,7 +128,6 @@ docker-image-debian-nios2-cross:
$(DOCKER_FILES_DIR)/debian-toolchain.docker \
$(call debian-toolchain, $@)
# Specialist build images, sometimes very limited tools
-docker-image-debian-loongarch-cross: docker-image-debian11
docker-image-debian-microblaze-cross: docker-image-debian10
docker-image-debian-nios2-cross: docker-image-debian10
diff --git a/tests/docker/dockerfiles/debian-loongarch-cross.docker
b/tests/docker/dockerfiles/debian-loongarch-cross.docker
index ca2469d2a8..a8e8e98909 100644
--- a/tests/docker/dockerfiles/debian-loongarch-cross.docker
+++ b/tests/docker/dockerfiles/debian-loongarch-cross.docker
@@ -1,11 +1,13 @@
#
# Docker cross-compiler target
#
-# This docker target builds on the debian11 base image,
-# using a prebuilt toolchains for LoongArch64 from:
+# This docker target uses prebuilt toolchains for LoongArch64 from:
# https://github.com/loongson/build-tools/releases
#
-FROM qemu/debian11
+FROM docker.io/library/debian:11-slim
+
+# Duplicate deb line as deb-src
+RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >>
/etc/apt/sources.list
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
--
2.34.1
- [PULL 22/30] tests/docker: flatten debian-riscv64-test-cross, (continued)
- [PULL 22/30] tests/docker: flatten debian-riscv64-test-cross, Alex Bennée, 2022/09/20
- [PULL 15/30] tests/docker: remove tricore qemu/debian10 dependency, Alex Bennée, 2022/09/20
- [PULL 25/30] tests/docker: update and flatten debian-amd64-cross, Alex Bennée, 2022/09/20
- [PULL 24/30] tests/lcitool: bump to latest version, Alex Bennée, 2022/09/20
- [PULL 27/30] tests/docker: update and flatten debian-hexagon-cross, Alex Bennée, 2022/09/20
- [PULL 20/30] gitlab-ci: update aarch32/aarch64 custom runner jobs, Alex Bennée, 2022/09/20
- [PULL 29/30] tests/docker: remove FROM qemu/ support from docker.py, Alex Bennée, 2022/09/20
- [PULL 21/30] Deprecate 32 bit big-endian MIPS, Alex Bennée, 2022/09/20
- [PULL 12/30] tests/docker: update and flatten debian-sh4-cross, Alex Bennée, 2022/09/20
- [PULL 30/30] tests/docker: remove the Debian base images, Alex Bennée, 2022/09/20
- [PULL 26/30] tests/docker: update and flatten debian-loongarch-cross,
Alex Bennée <=
- [PULL 18/30] configure: explicitly set cflags for --disable-pie, Alex Bennée, 2022/09/20
- [PULL 23/30] tests/docker: update and flatten debian-all-test-cross, Alex Bennée, 2022/09/20
- [PULL 28/30] tests/docker: update and flatten debian-toolchain, Alex Bennée, 2022/09/20
- [PULL 14/30] tests/docker: flatten debian-powerpc-test-cross, Alex Bennée, 2022/09/20
- Re: [PULL 00/30] testing updates (docker, avocado, deprecate 32bit BE MIPS), Stefan Hajnoczi, 2022/09/22