diff options
| author | Evgeny Vereshchagin <evvers@ya.ru> | 2019-05-29 23:11:01 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-29 23:11:01 +0300 |
| commit | 0813a5efb24217eee0899f3994c84a5b64b2aa1c (patch) | |
| tree | e6fea39ba50108b8ab41512aaa00a2937b99ae22 /travis-ci | |
| parent | 8e30a1af242c76a6110ab84aa4e4fdc69b19e11c (diff) | |
| parent | 75acb946cc97f3434714391ccd4fc0674e05ab0f (diff) | |
| download | systemd-0813a5efb24217eee0899f3994c84a5b64b2aa1c.tar.gz | |
Merge pull request #12617 from mbiebl/skip-test-bpf-containers
test-bpf: skip test when run inside containers
Diffstat (limited to 'travis-ci')
| -rwxr-xr-x | travis-ci/managers/debian.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/travis-ci/managers/debian.sh b/travis-ci/managers/debian.sh index dd9b816c98..95f34cf8fa 100755 --- a/travis-ci/managers/debian.sh +++ b/travis-ci/managers/debian.sh @@ -35,7 +35,7 @@ for phase in "${PHASES[@]}"; do info "Using Debian $DEBIAN_RELEASE" printf "FROM debian:$DEBIAN_RELEASE\nRUN bash -c 'apt-get -y update && apt-get install -y systemd'\n" | docker build -t debian-with-systemd/latest - info "Starting container $CONT_NAME" - $DOCKER_RUN -v $REPO_ROOT:/build:rw \ + $DOCKER_RUN -v $REPO_ROOT:/build:rw -e container=docker \ -w /build --privileged=true --name $CONT_NAME \ -dit --net=host debian-with-systemd/latest /bin/systemd $DOCKER_EXEC bash -c "echo deb-src http://deb.debian.org/debian $DEBIAN_RELEASE main >>/etc/apt/sources.list" |