aboutsummaryrefslogtreecommitdiff
path: root/tests/docker/dockerfiles
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2023-10-29 14:50:23 +0000
committerAlex Bennée <alex.bennee@linaro.org>2023-10-31 14:10:14 +0000
commit95f5bf952106f659b16d920dd74d118a4d36b0da (patch)
tree6c79c0c81eaa7a8a596db87e3b95d23c77db3579 /tests/docker/dockerfiles
parenteb4cb4ed1f62ca01ebb23f5fdf89751a2486c96d (diff)
downloadqemu-95f5bf952106f659b16d920dd74d118a4d36b0da.zip
qemu-95f5bf952106f659b16d920dd74d118a4d36b0da.tar.gz
qemu-95f5bf952106f659b16d920dd74d118a4d36b0da.tar.bz2
tests/docker: use debian-all-test-cross for hppa
Maintaining two sets of containers for test building is silly. While it makes sense for the QEMU cross-compile targets to have their own fat containers built by lcitool we might as well merge the other random debian based compilers into the same one used on gitlab. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20231029145033.592566-10-alex.bennee@linaro.org>
Diffstat (limited to 'tests/docker/dockerfiles')
-rw-r--r--tests/docker/dockerfiles/debian-hppa-cross.docker19
1 files changed, 0 insertions, 19 deletions
diff --git a/tests/docker/dockerfiles/debian-hppa-cross.docker b/tests/docker/dockerfiles/debian-hppa-cross.docker
deleted file mode 100644
index dd47ffd..0000000
--- a/tests/docker/dockerfiles/debian-hppa-cross.docker
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Docker cross-compiler target
-#
-# This docker target builds on the Debian Bullseye base image.
-#
-FROM docker.io/library/debian:11-slim
-
-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-hppa-linux-gnu \
- libc6-dev-hppa-cross
-# As a final step configure the user (if env is defined)
-ARG USER
-ARG UID
-RUN if [ "${USER}" ]; then \
- id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi