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

Enable IPv6 in Docker #5429

Merged
merged 4 commits into from
Dec 21, 2017
Merged

Enable IPv6 in Docker #5429

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad55c16
Enable IPv6 in Docker
cotsog Dec 21, 2017
daf4c18
Fixed YAML escaping
cotsog Dec 21, 2017
4291dd3
Simplified JSON string based on code review
cotsog Dec 21, 2017
bcb6ae9
Improve JSON string readability
cotsog Dec 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ matrix:
os: linux

before_install:
- echo -e "{\n \"ipv6\":true,\n \"fixed-cidr-v6\":\"2001:db8:1::/64\"\n}" | sudo tee /etc/docker/daemon.json
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe use the multiline string syntax of yaml to make it less cluttered with \n, and more clear?

Copy link
Member

@straight-shoota straight-shoota Dec 21, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or just remove the linebreaks. They're not needed for JSON and there is no gain from having a pretty formatted file here.
The shell argument can be single quoted as well, this way you don't need any escapes at all.

echo '{ "ipv6": true, "fixed-cidr-v6": "2001:db8:1::/64" }' | sudo tee /etc/docker/daemon.json

Copy link
Contributor

@bew bew Dec 21, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

true, didn't realized it was json!

- sudo service docker restart
- bin/ci prepare_system

install:
Expand Down