[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 27/30] tests/docker: update and flatten debian-hexagon-cross
From: |
Alex Bennée |
Subject: |
[PULL 27/30] tests/docker: update and flatten debian-hexagon-cross |
Date: |
Tue, 20 Sep 2022 18:15:30 +0100 |
Update to the latest stable Debian. While we are at it flatten into a
single dockerfile as we do not some of the extraneous packages from
the base image to build the toolchain.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220914155950.804707-28-alex.bennee@linaro.org>
diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker
b/tests/docker/dockerfiles/debian-hexagon-cross.docker
index d5dc299dc1..8d219bb81d 100644
--- a/tests/docker/dockerfiles/debian-hexagon-cross.docker
+++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker
@@ -2,12 +2,10 @@
# Docker Hexagon cross-compiler target
#
# This docker target is used for building hexagon tests. As it also
-# needs to be able to build QEMU itself in CI we include it's
-# build-deps. It is also a "stand-alone" image so as not to be
-# triggered by re-builds on other base images given it takes a long
-# time to build.
+# needs to be able to build QEMU itself in CI we include its
+# build-deps.
#
-FROM qemu/debian10
+FROM docker.io/library/debian:11-slim
# Install common build utilities
RUN apt update && \
@@ -15,11 +13,18 @@ RUN apt update && \
DEBIAN_FRONTEND=noninteractive eatmydata \
apt install -y --no-install-recommends \
bison \
+ ca-certificates \
+ clang \
cmake \
flex \
+ gcc \
lld \
+ make \
+ ninja-build \
+ python3 \
rsync \
- wget
+ wget \
+ xz-utils
ENV TOOLCHAIN_INSTALL /usr/local
ENV ROOTFS /usr/local
@@ -32,7 +37,7 @@ ADD build-toolchain.sh
/root/hexagon-toolchain/build-toolchain.sh
RUN cd /root/hexagon-toolchain && ./build-toolchain.sh
-FROM debian:buster-slim
+FROM docker.io/library/debian:11-slim
# Duplicate deb line as deb-src
RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >>
/etc/apt/sources.list
# Install QEMU build deps for use in CI
--
2.34.1
- [PULL 06/30] tests/avocado: split the AST2x00Machine classes, (continued)
- [PULL 06/30] tests/avocado: split the AST2x00Machine classes, Alex Bennée, 2022/09/20
- [PULL 11/30] tests/docker: update and flatten debian-mips64-cross, Alex Bennée, 2022/09/20
- [PULL 17/30] tests/vm: Remove obsolete Fedora VM test, Alex Bennée, 2022/09/20
- [PULL 19/30] gitlab-ci/custom-runners: Disable -static-pie for ubuntu-20.04-aarch64, Alex Bennée, 2022/09/20
- [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 <=
- [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, 2022/09/20
- [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