[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 16/25] tests/docker: flatten debian-riscv64-test-cross
From: |
Alex Bennée |
Subject: |
[PATCH v1 16/25] tests/docker: flatten debian-riscv64-test-cross |
Date: |
Fri, 26 Aug 2022 18:21:19 +0100 |
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>
---
.gitlab-ci.d/container-cross.yml | 1 -
tests/docker/Makefile.include | 1 -
.../dockerfiles/debian-riscv64-test-cross.docker | 10 ++++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml
index 95d57e1c5d..3a8bd75473 100644
--- a/.gitlab-ci.d/container-cross.yml
+++ b/.gitlab-ci.d/container-cross.yml
@@ -122,7 +122,6 @@ riscv64-debian-cross-container:
riscv64-debian-test-cross-container:
extends: .container_job_template
stage: containers
- needs: ['amd64-debian11-container']
variables:
NAME: debian-riscv64-test-cross
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index b1bf56434f..24cd44e667 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -133,7 +133,6 @@ docker-image-debian-all-test-cross: docker-image-debian10
docker-image-debian-loongarch-cross: docker-image-debian11
docker-image-debian-microblaze-cross: docker-image-debian10
docker-image-debian-nios2-cross: docker-image-debian10
-docker-image-debian-riscv64-test-cross: docker-image-debian11
# These images may be good enough for building tests but not for test builds
DOCKER_PARTIAL_IMAGES += debian-alpha-cross
diff --git a/tests/docker/dockerfiles/debian-riscv64-test-cross.docker
b/tests/docker/dockerfiles/debian-riscv64-test-cross.docker
index 1d90901298..e5f83a5aeb 100644
--- a/tests/docker/dockerfiles/debian-riscv64-test-cross.docker
+++ b/tests/docker/dockerfiles/debian-riscv64-test-cross.docker
@@ -3,10 +3,12 @@
#
# This docker target builds on the Debian Bullseye base image.
#
-FROM qemu/debian11
+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-riscv64-linux-gnu \
libc6-dev-riscv64-cross
--
2.30.2
- Re: [PATCH v1 22/25] tests/docker: update and flatten debian-toolchain, (continued)
- [PATCH v1 21/25] tests/docker: update and flatten debian-hexagon-cross, Alex Bennée, 2022/08/26
- [PATCH v1 25/25] gitlab-ci: Only use one process in Windows jobs for compilation, Alex Bennée, 2022/08/26
- [PATCH v1 20/25] tests/docker: update and flatten debian-loongarch-cross, Alex Bennée, 2022/08/26
- [PATCH v1 19/25] tests/docker: update and flatten debian-amd64-cross, Alex Bennée, 2022/08/26
- [PATCH v1 23/25] tests/docker: remove FROM qemu/ support from docker.py, Alex Bennée, 2022/08/26
- [PATCH v1 16/25] tests/docker: flatten debian-riscv64-test-cross,
Alex Bennée <=