diff options
| author | Julian Andres Klode <jak@debian.org> | 2017-07-01 22:41:12 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2017-07-02 00:00:58 +0200 |
| commit | d34f0e25df621b902d9336287d372530cc45cef9 (patch) | |
| tree | 1a57fee02653f6c5ceedbed7c130285b8dbb68dc | |
| parent | c72cc1c1ce2251a7809233d6791141bc777cb899 (diff) | |
travis/docker: Various improvements
- Use a tmpfs for /tmp - not really a benefit here,
except for travis as it's writing less now.
- Use the fastly CDN - about twice as fast as ftp.de,
and seems more stable than cloudfront
- Run apt-get clean to keep container smaller - should
not be needed really, but let's just do it.
Gbp-Dch: ignore
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Dockerfile | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 1f461422b..0685cdb76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,6 @@ before_script: script: - docker run --rm -w $PWD -v $PWD:$PWD --user=travis apt-ci env CTEST_OUTPUT_ON_FAILURE=1 ninja -C build test - docker run --rm -w $PWD -v $PWD:$PWD --user=travis apt-ci env DESTDIR=$PWD/rootdir chronic ninja -C build install - - docker run --rm -w $PWD -v $PWD:$PWD --user=$USER apt-ci unbuffer ./test/integration/run-tests -qq -j 4 + - docker run --rm -w $PWD -v $PWD:$PWD --user=$USER --tmpfs /tmp:suid,exec apt-ci unbuffer ./test/integration/run-tests -qq -j 4 after_script: - docker run --rm -w $PWD/build -v $PWD:$PWD --user=$USER `bash <(curl -s https://codecov.io/env)` apt-ci bash -c 'bash <(curl -s https://codecov.io/bash)' diff --git a/Dockerfile b/Dockerfile index be7c36e49..b7af5f629 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,11 @@ FROM debian:testing COPY . /tmp WORKDIR /tmp -RUN sed -i s#deb.debian.org#ftp.de.debian.org# /etc/apt/sources.list \ +RUN sed -i s#://deb.debian.org#://cdn-fastly.deb.debian.org# /etc/apt/sources.list \ && apt-get update \ && adduser --home /home/travis travis --quiet --disabled-login --gecos "" --uid 1000 \ && env DEBIAN_FRONTEND=noninteractive apt-get install build-essential ccache ninja-build expect curl git -q -y \ && env DEBIAN_FRONTEND=noninteractive ./prepare-release travis-ci \ && dpkg-reconfigure ccache \ - && rm -r /tmp/* + && rm -r /tmp/* \ + && apt-get clean |