[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v1 4/8] docker: update Travis docker image
From: |
Alex Bennée |
Subject: |
Re: [Qemu-devel] [PATCH v1 4/8] docker: update Travis docker image |
Date: |
Thu, 31 May 2018 21:14:50 +0100 |
User-agent: |
mu4e 1.1.0; emacs 26.1.50 |
Philippe Mathieu-Daudé <address@hidden> writes:
> Hi Alex,
>
> On 05/30/2018 08:06 AM, Alex Bennée wrote:
>> 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
>
> I don't understand how this is related to QEMU testing, isn't it rather
> some Travis-ci bug? We don't need to use PhantomJS / Neo4j / Maven.
It's oddly constructed I'll grant you but I just set the path to what a
running image has. The normal image is started up with a full systemd
init whereas we drop directly into the shell.
>
>> - force the build USER to be Travis
>> - add clang to FEATURES for our test-clang machinery
>>
>> Signed-off-by: Alex Bennée <address@hidden>
>> ---
>> 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
>>
--
Alex Bennée
- [Qemu-devel] [PATCH v1 0/8] Travis stability and a few docker patches, Alex Bennée, 2018/05/30
- [Qemu-devel] [PATCH v1 5/8] .travis.yml: rationalise clang testing, Alex Bennée, 2018/05/30
- [Qemu-devel] [PATCH v1 3/8] docker: do not display deprecated images in 'make docker' help, Alex Bennée, 2018/05/30
- [Qemu-devel] [PATCH v1 7/8] .travis.yml: update GCC sanitizer build to GCC 7, Alex Bennée, 2018/05/30
- [Qemu-devel] [PATCH v1 8/8] tests/Makefile: mark flakey tests (!UPSTREAM), Alex Bennée, 2018/05/30
- [Qemu-devel] [PATCH v1 6/8] .travis.yml: make current setup explicit, Alex Bennée, 2018/05/30
- [Qemu-devel] [PATCH v1 2/8] docker: sort images list displayed by 'make docker', Alex Bennée, 2018/05/30