diff options
| author | bors <bors@rust-lang.org> | 2017-12-26 05:46:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-12-26 05:46:11 +0000 |
| commit | 2e83f3c968a3c3e4c2e3d0150cfef7d9a97413c2 (patch) | |
| tree | f8bf2e669d926bb7e03992c888da08008fbef9ea | |
| parent | ebddfcb0b19471d2277e05cfbc2ad8caa81637b7 (diff) | |
| parent | 472a3c104b88175c4c370493994aa866ec6a7b54 (diff) | |
| download | rust-2e83f3c968a3c3e4c2e3d0150cfef7d9a97413c2.tar.gz rust-2e83f3c968a3c3e4c2e3d0150cfef7d9a97413c2.zip | |
Auto merge of #47000 - kennytm:follow-up-46924, r=arielb1
Follow up to #46924, fix massive spurious failure when starting docker It seems using `fe80::/64` causes `docker start` to fail with "Address already in use". Try to change to a unique local address range instead. `fe80::/64` is a link-local address (similar to `169.254.0.0/16` in IPv4). Let's try to use a random "private network" address to see whether that fixes things. cc #47002 r? @aidanhs
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 4458cd222f2..090e46b9ea7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -194,7 +194,7 @@ before_install: # they shouldn't exist, please revert once more official solutions appeared. # see https://github.com/travis-ci/travis-ci/issues/8891#issuecomment-353403729 - if [ "$TRAVIS_OS_NAME" = linux ]; then - echo '{"ipv6":true,"fixed-cidr-v6":"fe80::/64"}' | sudo tee /etc/docker/daemon.json; + echo '{"ipv6":true,"fixed-cidr-v6":"fd9a:8454:6789:13f7::/64"}' | sudo tee /etc/docker/daemon.json; sudo service docker restart; fi |