[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/7] docker: update Travis docker image
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 4/7] docker: update Travis docker image |
Date: |
Fri, 1 Jun 2018 17:20:58 +0100 |
This is still poorly documented by Travis but according to:
https://docs.travis-ci.com/user/common-build-problems/#Running-a-Container-Based-Docker-Image-Locally
their reference images are now hosted on Docker Hub. So we update the
FROM line to refer to the new default image. We also need a few
additional tweaks:
- re-enable deb-src lines for our build-dep install
- add explicit PATH definition for tools
- force the build USER to be Travis
- add clang to FEATURES for our test-clang machinery
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
diff --git a/tests/docker/dockerfiles/travis.docker
b/tests/docker/dockerfiles/travis.docker
index 605b6e429b..c5ad39b533 100644
--- a/tests/docker/dockerfiles/travis.docker
+++ b/tests/docker/dockerfiles/travis.docker
@@ -1,8 +1,13 @@
-FROM quay.io/travisci/travis-ruby
+FROM travisci/ci-garnet:packer-1512502276-986baf0
ENV DEBIAN_FRONTEND noninteractive
ENV LANG en_US.UTF-8
ENV LC_ALL en_US.UTF-8
+RUN cat /etc/apt/sources.list | sed "s/# deb-src/deb-src/" >>
/etc/apt/sources.list
RUN apt-get update
RUN apt-get -y build-dep qemu
RUN apt-get -y install device-tree-compiler python2.7 python-yaml
dh-autoreconf gdb strace lsof net-tools
-ENV FEATURES pyyaml
+# Travis tools require PhantomJS / Neo4j / Maven accessible
+# in their PATH (QEMU build won't access them).
+ENV PATH
/usr/local/phantomjs/bin:/usr/local/phantomjs:/usr/local/neo4j-3.2.7/bin:/usr/local/maven-3.5.2/bin:/usr/local/cmake-3.9.2/bin:/usr/local/clang-5.0.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ENV FEATURES clang pyyaml
+USER travis
--
2.17.0
- [Qemu-devel] [PULL 0/7] Travis updates, Alex Bennée, 2018/06/01
- [Qemu-devel] [PULL 4/7] docker: update Travis docker image,
Alex Bennée <=
- [Qemu-devel] [PULL 3/7] docker: do not display deprecated images in 'make docker' help, Alex Bennée, 2018/06/01
- [Qemu-devel] [PULL 1/7] .travis.yml: disable linux-user build for gcov, Alex Bennée, 2018/06/01
- [Qemu-devel] [PULL 2/7] docker: sort images list displayed by 'make docker', Alex Bennée, 2018/06/01
- [Qemu-devel] [PULL 5/7] .travis.yml: rationalise clang testing, Alex Bennée, 2018/06/01
- [Qemu-devel] [PULL 6/7] .travis.yml: make current setup explicit, Alex Bennée, 2018/06/01
- [Qemu-devel] [PULL 7/7] .travis.yml: update GCC sanitizer build to GCC 7, Alex Bennée, 2018/06/01
- Re: [Qemu-devel] [PULL 0/7] Travis updates, Peter Maydell, 2018/06/04