[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 14/30] tests/docker: flatten debian-powerpc-test-cross
From: |
Alex Bennée |
Subject: |
[PATCH v2 14/30] tests/docker: flatten debian-powerpc-test-cross |
Date: |
Wed, 14 Sep 2022 16:59:34 +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>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220826172128.353798-10-alex.bennee@linaro.org>
---
.gitlab-ci.d/container-cross.yml | 1 -
tests/docker/Makefile.include | 1 -
.../dockerfiles/debian-powerpc-test-cross.docker | 12 +++++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml
index db0ea15d0d..67bbf19a27 100644
--- a/.gitlab-ci.d/container-cross.yml
+++ b/.gitlab-ci.d/container-cross.yml
@@ -102,7 +102,6 @@ mipsel-debian-cross-container:
powerpc-test-cross-container:
extends: .container_job_template
stage: containers
- needs: ['amd64-debian11-container']
variables:
NAME: debian-powerpc-test-cross
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 8828b6b8fa..e034eca3af 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -137,7 +137,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-powerpc-test-cross: docker-image-debian11
docker-image-debian-riscv64-test-cross: docker-image-debian11
# These images may be good enough for building tests but not for test builds
diff --git a/tests/docker/dockerfiles/debian-powerpc-test-cross.docker
b/tests/docker/dockerfiles/debian-powerpc-test-cross.docker
index 36b336f709..d6b2909cc4 100644
--- a/tests/docker/dockerfiles/debian-powerpc-test-cross.docker
+++ b/tests/docker/dockerfiles/debian-powerpc-test-cross.docker
@@ -1,13 +1,15 @@
#
# Docker powerpc/ppc64/ppc64le cross-compiler target
#
-# This docker target builds on the debian Bullseye base image.
+# 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-powerpc-linux-gnu \
libc6-dev-powerpc-cross \
gcc-10-powerpc64-linux-gnu \
--
2.34.1
- Re: [PATCH v2 06/30] tests/avocado: split the AST2x00Machine classes, (continued)
- [PATCH v2 09/30] tests/docker: update and flatten debian-hppa-cross, Alex Bennée, 2022/09/14
- [PATCH v2 08/30] tests/docker: update and flatten debian-alpha-cross, Alex Bennée, 2022/09/14
- [PATCH v2 10/30] tests/docker: update and flatten debian-m68k-cross, Alex Bennée, 2022/09/14
- [PATCH v2 07/30] tests/avocado: reduce the default timeout to 120s, Alex Bennée, 2022/09/14
- [PATCH v2 04/30] tests/avocado: add explicit timeout for s390 TCG tests, Alex Bennée, 2022/09/14
- [PATCH v2 12/30] tests/docker: update and flatten debian-sh4-cross, Alex Bennée, 2022/09/14
- [PATCH v2 14/30] tests/docker: flatten debian-powerpc-test-cross,
Alex Bennée <=
- [PATCH v2 16/30] tests/docker: remove amd64 qemu/debian10 dependency, Alex Bennée, 2022/09/14
- [PATCH v2 13/30] tests/docker: update and flatten debian-sparc64-cross, Alex Bennée, 2022/09/14
- [PATCH v2 15/30] tests/docker: remove tricore qemu/debian10 dependency, Alex Bennée, 2022/09/14
- [PATCH v2 19/30] gitlab-ci/custom-runners: Disable -static-pie for ubuntu-20.04-aarch64, Alex Bennée, 2022/09/14
- [PATCH v2 27/30] tests/docker: update and flatten debian-hexagon-cross, Alex Bennée, 2022/09/14
- [PATCH v2 17/30] tests/vm: Remove obsolete Fedora VM test, Alex Bennée, 2022/09/14
- [PATCH v2 29/30] tests/docker: remove FROM qemu/ support from docker.py, Alex Bennée, 2022/09/14