aboutsummaryrefslogtreecommitdiff
path: root/tests/docker
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2017-03-06 11:28:48 +0000
committerFam Zheng <famz@redhat.com>2017-03-10 15:05:22 +0800
commit8ba1e5f72b17584f23e17c54494bb4beeb05174e (patch)
tree25934f232775fb266cd704fb64b62fa9978121f7 /tests/docker
parent06cc3551714f2c9ee0d12f78a2ecd7e21b484fc8 (diff)
downloadqemu-8ba1e5f72b17584f23e17c54494bb4beeb05174e.zip
qemu-8ba1e5f72b17584f23e17c54494bb4beeb05174e.tar.gz
qemu-8ba1e5f72b17584f23e17c54494bb4beeb05174e.tar.bz2
docker/dockerfiles/debian-s390-cross: include clang
It's a silly little limitation on Shippable that is looks for clang in the container even though we won't use it. The arm/aarch64 cross builds inherit this from debian.docker but as we needed to use debian-testing for this we add it here. We also collapse the update step into one RUN line to remove and intermediate layer of the docker build. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20170306112848.659-1-alex.bennee@linaro.org> Signed-off-by: Fam Zheng <famz@redhat.com>
Diffstat (limited to 'tests/docker')
-rw-r--r--tests/docker/dockerfiles/debian-s390x-cross.docker4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
index bbb21ed..3a687fe 100644
--- a/tests/docker/dockerfiles/debian-s390x-cross.docker
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@@ -13,8 +13,8 @@ RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list
RUN dpkg --add-architecture s390x
# Grab the updated list of packages
-RUN apt update
-RUN apt dist-upgrade -yy
+RUN apt update && apt dist-upgrade -yy
+RUN apt install -yy build-essential clang
RUN apt-get build-dep -yy -a s390x qemu || apt-get -f install
RUN apt install -yy gcc-multilib-s390x-linux-gnu binutils-multiarch