Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert #46694 (Temporarily use the old Travis image) #46924

Merged
merged 2 commits into from
Dec 25, 2017
Merged

Revert #46694 (Temporarily use the old Travis image) #46924

merged 2 commits into from
Dec 25, 2017

Conversation

kennytm
Copy link
Member

@kennytm kennytm commented Dec 21, 2017 •
edited
Loading

This PR reverts #46694, and applies the solution recommended in travis-ci/travis-ci#8891 (comment).

r? @aidanhs

@kennytm kennytm added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Dec 21, 2017
@kennytm kennytm changed the title [WIP] Revert #46694 (Temporarily use the old Travis image) Revert #46694 (Temporarily use the old Travis image) Dec 21, 2017
@kennytm
Copy link
Member Author

kennytm commented Dec 21, 2017

Travis is green. Though maybe we could wait a few more days before merging, to see whether those two commands will be folded into the official image.

@kennytm kennytm added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 21, 2017
@aidanhs
Copy link
Member

aidanhs commented Dec 21, 2017

This seems good, but I looked up the address suggested since I know very little about IPv6.

http://silmor.de/ipv6.address.php and https://en.wikipedia.org/wiki/IPv6_address suggest 2001:db8::/32 is for documentation purposes only. I suspect the author of that comment copied it from the Docker documentation.

Instead, can we use the link-local address? I.e. {"ipv6":true,"fixed-cidr-v6":"fe80::/64"}. I tested it on Docker locally and it seems to correctly assign an ipv6 address.

r=me once that's done.

@aidanhs
Copy link
Member

aidanhs commented Dec 21, 2017 •
edited
Loading

(I'd merge rather than waiting since I suspect they're not going to make ad-hoc changes like this when they'll be shorter-staffed due to xmas)

@kennytm
Copy link
Member Author

kennytm commented Dec 22, 2017

@bors r=aidanhs rollup

@bors
Copy link
Contributor

bors commented Dec 22, 2017

📌 Commit 0ea0218 has been approved by aidanhs

@kennytm kennytm mentioned this pull request Dec 23, 2017
Closed
@kennytm
Copy link
Member Author

kennytm commented Dec 23, 2017

@bors r-

Needs to limit those docker commands to Linux.

@kennytm
Copy link
Member Author

kennytm commented Dec 23, 2017

@bors r=aidanhs

@bors
Copy link
Contributor

bors commented Dec 23, 2017

📌 Commit 8d76e28 has been approved by aidanhs

@kennytm kennytm mentioned this pull request Dec 23, 2017
Closed
@kennytm
Copy link
Member Author

kennytm commented Dec 23, 2017

@bors rollup-

This PR caused sccache to fail with "Address already in use" during docker image setup when rolled up with other PRs. But Travis is green here 😕.

Details: https://travis-ci.org/rust-lang/rust/builds/320656619

@bors
Copy link
Contributor

bors commented Dec 25, 2017

⌛ Testing commit 8d76e28 with merge 0cd6758...

bors added a commit that referenced this pull request Dec 25, 2017
@bors
Auto merge of #46924 - kennytm:revert-46694, r=aidanhs
0cd6758 
Revert #46694 (Temporarily use the old Travis image)

This PR reverts #46694, and applies the solution recommended in travis-ci/travis-ci#8891 (comment).

r? @aidanhs
@bors
Copy link
Contributor

bors commented Dec 25, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: aidanhs
Pushing 0cd6758 to master...

@bors bors merged commit 8d76e28 into rust-lang:master Dec 25, 2017
@kennytm kennytm deleted the revert-46694 branch December 25, 2017 10:10
kennytm added a commit to kennytm/rust that referenced this pull request Dec 25, 2017
@kennytm
Follow up to rust-lang#46924
472a3c1 
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.
@kennytm kennytm mentioned this pull request Dec 25, 2017
Closed
bors added a commit that referenced this pull request Dec 25, 2017
@bors
Auto merge of #47000 - kennytm:follow-up-46924, r=arielb1
7674ffb 
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
bors added a commit that referenced this pull request Dec 26, 2017
@bors
Auto merge of #47000 - kennytm:follow-up-46924, r=arielb1
2e83f3c 
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@aidanhs aidanhs

Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@kennytm @aidanhs @bors