Browse Source

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
tags/debian/1.5_beta1
Julian Andres Klode 4 years ago
parent
commit
d34f0e25df
2 changed files with 4 additions and 3 deletions
  1. +1
    -1
      .travis.yml
  2. +3
    -2
      Dockerfile

+ 1
- 1
.travis.yml View File

@@ -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)'

+ 3
- 2
Dockerfile View File

@@ -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

Loading…
Cancel
Save