| Message ID | 20220826172128.353798-21-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | testing updates and mips deprecation | expand |
On 26/08/2022 19.21, Alex Bennée wrote: > 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> > --- > tests/docker/Makefile.include | 1 - > tests/docker/dockerfiles/debian-loongarch-cross.docker | 5 ++++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > 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..48fe64c51b 100644 > --- a/tests/docker/dockerfiles/debian-loongarch-cross.docker > +++ b/tests/docker/dockerfiles/debian-loongarch-cross.docker > @@ -5,7 +5,10 @@ > # using a prebuilt toolchains for LoongArch64 from: > # https://github.com/loongson/build-tools/releases > # > -FROM qemu/debian11 > +FROM docker.io/library/debian:bullseye-slim In previous patches you were using "debian:11-slim", now it's "bullseye-slim" ? ... doesn't matter much, but it's a little bit inconsistent. Anyway: Reviewed-by: Thomas Huth <thuth@redhat.com>
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..48fe64c51b 100644 --- a/tests/docker/dockerfiles/debian-loongarch-cross.docker +++ b/tests/docker/dockerfiles/debian-loongarch-cross.docker @@ -5,7 +5,10 @@ # using a prebuilt toolchains for LoongArch64 from: # https://github.com/loongson/build-tools/releases # -FROM qemu/debian11 +FROM docker.io/library/debian:bullseye-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 && \
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> --- tests/docker/Makefile.include | 1 - tests/docker/dockerfiles/debian-loongarch-cross.docker | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-)