Skip to content

Allow user to specify default address pools for docker networks - #818

Merged
thaJeztah merged 1 commit into
docker:masterfrom
selansen:master
May 8, 2018
Merged

Allow user to specify default address pools for docker networks#818
thaJeztah merged 1 commit into
docker:masterfrom
selansen:master

Conversation

@selansen

@selansenselansen commented Jan 19, 2018

Copy link
Copy Markdown
Contributor

This is separate commit for CLI files to address PR moby/moby#36054moby/moby#36396

Signed-off-by: selansen elango.siva@docker.com

- What I did

- How I did it

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@thaJeztahthaJeztah changed the title Allow user to specify default address pools for docker networks[do not merge] Allow user to specify default address pools for docker networksJan 19, 2018
@codecov-io

codecov-io commented Jan 19, 2018

Copy link
Copy Markdown

Codecov Report

❗ No coverage uploaded for pull request base (master@0ff5f52). Click here to learn what that means.
The diff coverage is n/a.

@@ Coverage Diff @@## master #818 +/- ##
=========================================
Coverage ? 51.67% =========================================
Files ? 244 Lines ? 15823 Branches ? 0 =========================================
Hits ? 8177 Misses ? 7101 Partials ? 545

@mdlinvillemdlinville left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Docs LGTM

@selansenselansen changed the title [do not merge] Allow user to specify default address pools for docker networks Allow user to specify default address pools for docker networksMay 1, 2018
-D, --debug Enable debug mode
--default-gateway ip Container default gateway IPv4 address
--default-gateway-v6 ip Container default gateway IPv6 address
--default-address-pools Set the default address pools for local node networks

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This should be singular now

Also, I think this page has an example daemon.json; can you update that one as well (with some example values)

Comment threadman/dockerd.8.md Outdated
[**-D**|**--debug**]
[**--default-gateway**[=*DEFAULT-GATEWAY*]]
[**--default-gateway-v6**[=*DEFAULT-GATEWAY-V6*]]
[**--default-address-pools**[=*DEFAULT-ADDRESS-POOLS*]]

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

same here

@selansen

selansen commented May 1, 2018 via email

Copy link
Copy Markdown
ContributorAuthor

@selansen
selansenforce-pushed the master branch 2 times, most recently from 43c360e to e949b50CompareMay 4, 2018 17:21
@selansen

Copy link
Copy Markdown
ContributorAuthor

I thought I pushed my changes but looks like I forgot to push it. updated @thaJeztah review comments.

]
}
}
"default-address-pools":[{"base":"172.80.0.0/16","size":24},

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks like there's a comma missing in the JSON (it shows as invalid)

This is separate commit for CLI files to address PR 36054
Signed-off-by: selansen <elango.siva@docker.com>
@selansen

Copy link
Copy Markdown
ContributorAuthor

corrected it.

@thaJeztahthaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

ping @gbarr01 for additional documentation changes in other sections of the documentation

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@selansen@codecov-io@thaJeztah@mdlinville@GordonTheTurtle