[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/30] tests/docker: update and flatten debian-sh4-cross
From: |
Alex Bennée |
Subject: |
[PULL 12/30] tests/docker: update and flatten debian-sh4-cross |
Date: |
Tue, 20 Sep 2022 18:15:15 +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.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220914155950.804707-13-alex.bennee@linaro.org>
diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml
index a3bfa483bf..8a611fc824 100644
--- a/.gitlab-ci.d/container-cross.yml
+++ b/.gitlab-ci.d/container-cross.yml
@@ -137,7 +137,6 @@ s390x-debian-cross-container:
sh4-debian-cross-container:
extends: .container_job_template
stage: containers
- needs: ['amd64-debian10-container']
variables:
NAME: debian-sh4-cross
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 6c2ee3b175..37c4ea913f 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -89,7 +89,6 @@ DOCKER_PARTIAL_IMAGES += fedora
endif
docker-image-debian-mips-cross: docker-image-debian10
-docker-image-debian-sh4-cross: docker-image-debian10
docker-image-debian-sparc64-cross: docker-image-debian10
# The native build should never use the registry
diff --git a/tests/docker/dockerfiles/debian-sh4-cross.docker
b/tests/docker/dockerfiles/debian-sh4-cross.docker
index fd3af89575..d48ed9065f 100644
--- a/tests/docker/dockerfiles/debian-sh4-cross.docker
+++ b/tests/docker/dockerfiles/debian-sh4-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-sh4-linux-gnu \
libc6-dev-sh4-cross
--
2.34.1
- [PULL 13/30] tests/docker: update and flatten debian-sparc64-cross, (continued)
- [PULL 13/30] tests/docker: update and flatten debian-sparc64-cross, Alex Bennée, 2022/09/20
- [PULL 16/30] tests/docker: remove amd64 qemu/debian10 dependency, Alex Bennée, 2022/09/20
- [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 <=
- [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, 2022/09/20
- [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