From: "Alex Bennée" <alex.bennee@linaro.org>
To: cota@braap.org, famz@redhat.com, berrange@redhat.com,
f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com,
aurelien@aurel32.net, agraf@suse.de, pbonzini@redhat.com,
stefanha@redhat.com, stefanb@linux.vnet.ibm.com,
marcandre.lureau@redhat.com
Cc: qemu-devel@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>
Subject: [Qemu-devel] [PATCH v1 4/8] docker: update Travis docker image
Date: Wed, 30 May 2018 12:06:51 +0100 [thread overview]
Message-ID: <20180530110655.22022-5-alex.bennee@linaro.org> (raw)
In-Reply-To: <20180530110655.22022-1-alex.bennee@linaro.org>
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 <alex.bennee@linaro.org>
---
tests/docker/dockerfiles/travis.docker | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/travis.docker
index 605b6e429b..6e90f033d5 100644
--- a/tests/docker/dockerfiles/travis.docker
+++ b/tests/docker/dockerfiles/travis.docker
@@ -1,8 +1,11 @@
-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
+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
next prev parent reply other threads:[~2018-05-30 11:07 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-30 11:06 [Qemu-devel] [PATCH v1 0/8] Travis stability and a few docker patches Alex Bennée
2018-05-30 11:06 ` [Qemu-devel] [PATCH v1 1/8] .travis.yml: disable linux-user build for gcov Alex Bennée
2018-05-31 16:13 ` Philippe Mathieu-Daudé
2018-05-30 11:06 ` [Qemu-devel] [PATCH v1 2/8] docker: sort images list displayed by 'make docker' Alex Bennée
2018-05-30 11:06 ` [Qemu-devel] [PATCH v1 3/8] docker: do not display deprecated images in 'make docker' help Alex Bennée
2018-05-30 11:06 ` Alex Bennée [this message]
2018-05-31 16:19 ` [Qemu-devel] [PATCH v1 4/8] docker: update Travis docker image Philippe Mathieu-Daudé
2018-05-31 20:14 ` Alex Bennée
2018-05-31 23:08 ` Philippe Mathieu-Daudé
2018-05-30 11:06 ` [Qemu-devel] [PATCH v1 5/8] .travis.yml: rationalise clang testing Alex Bennée
2018-05-31 16:10 ` Philippe Mathieu-Daudé
2018-05-30 11:06 ` [Qemu-devel] [PATCH v1 6/8] .travis.yml: make current setup explicit Alex Bennée
2018-05-31 16:12 ` Philippe Mathieu-Daudé
2018-05-30 11:06 ` [Qemu-devel] [PATCH v1 7/8] .travis.yml: update GCC sanitizer build to GCC 7 Alex Bennée
2018-05-31 16:11 ` Philippe Mathieu-Daudé
2018-05-30 11:06 ` [Qemu-devel] [PATCH v1 8/8] tests/Makefile: mark flakey tests (!UPSTREAM) Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180530110655.22022-5-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=agraf@suse.de \
--cc=aurelien@aurel32.net \
--cc=balrogg@gmail.com \
--cc=berrange@redhat.com \
--cc=cota@braap.org \
--cc=f4bug@amsat.org \
--cc=famz@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=stefanb@linux.vnet.ibm.com \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).