aboutsummaryrefslogtreecommitdiff
path: root/tests/docker
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2022-09-14 16:59:47 +0100
committerAlex Bennée <alex.bennee@linaro.org>2022-09-20 17:22:08 +0100
commit581cd47fe5a708ebd999bd426a111984074c9ea6 (patch)
tree54f994151c2e7c65f9d7288c5e01e9e74995fad0 /tests/docker
parent35782a1b9a2ee71fb037bf1ec6379d5720abf817 (diff)
downloadqemu-581cd47fe5a708ebd999bd426a111984074c9ea6.zip
qemu-581cd47fe5a708ebd999bd426a111984074c9ea6.tar.gz
qemu-581cd47fe5a708ebd999bd426a111984074c9ea6.tar.bz2
tests/docker: update and flatten debian-hexagon-cross
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>
Diffstat (limited to 'tests/docker')
-rw-r--r--tests/docker/dockerfiles/debian-hexagon-cross.docker19
1 files changed, 12 insertions, 7 deletions
diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker b/tests/docker/dockerfiles/debian-hexagon-cross.docker
index d5dc299..8d219bb 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