[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 08/30] tests/docker: update and flatten debian-alpha-cross
From: |
Alex Bennée |
Subject: |
[PATCH v2 08/30] tests/docker: update and flatten debian-alpha-cross |
Date: |
Wed, 14 Sep 2022 16:59:28 +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: <20220826172128.353798-4-alex.bennee@linaro.org>
---
.gitlab-ci.d/container-cross.yml | 1 -
tests/docker/Makefile.include | 1 -
tests/docker/dockerfiles/debian-alpha-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 505b267542..802e332205 100644
--- a/.gitlab-ci.d/container-cross.yml
+++ b/.gitlab-ci.d/container-cross.yml
@@ -1,7 +1,6 @@
alpha-debian-cross-container:
extends: .container_job_template
stage: containers
- needs: ['amd64-debian10-container']
variables:
NAME: debian-alpha-cross
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 9a45e8890b..c565aa5e7b 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -88,7 +88,6 @@ DOCKER_PARTIAL_IMAGES += debian-s390x-cross
DOCKER_PARTIAL_IMAGES += fedora
endif
-docker-image-debian-alpha-cross: docker-image-debian10
docker-image-debian-hppa-cross: docker-image-debian10
docker-image-debian-m68k-cross: docker-image-debian10
docker-image-debian-mips-cross: docker-image-debian10
diff --git a/tests/docker/dockerfiles/debian-alpha-cross.docker
b/tests/docker/dockerfiles/debian-alpha-cross.docker
index 10fe30df0d..4eeb43c78a 100644
--- a/tests/docker/dockerfiles/debian-alpha-cross.docker
+++ b/tests/docker/dockerfiles/debian-alpha-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-alpha-linux-gnu \
libc6.1-dev-alpha-cross
--
2.34.1
- [PATCH v2 01/30] gitlab: reduce targets in cross_user_build_job, (continued)
- [PATCH v2 01/30] gitlab: reduce targets in cross_user_build_job, Alex Bennée, 2022/09/14
- [PATCH v2 03/30] tests/avocado: add explicit timeout for Aarch64 TCG tests, Alex Bennée, 2022/09/14
- [PATCH v2 05/30] tests/avocado: add explicit timeout for ppc64le TCG tests, Alex Bennée, 2022/09/14
- [PATCH v2 06/30] tests/avocado: split the AST2x00Machine classes, Alex Bennée, 2022/09/14
- [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 <=
- [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, 2022/09/14
- [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