Allow user to specify default address pools for docker networks #818
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
selansen
requested review from
mdlinville,
thaJeztah and
vdemeester
as code owners
thaJeztah
changed the title
Codecov Report
@@ Coverage Diff @@
## master #818 +/- ##
=========================================
Coverage ? 51.67%
=========================================
Files ? 244
Lines ? 15823
Branches ? 0
=========================================
Hits ? 8177
Misses ? 7101
Partials ? 545 |
selansen
changed the title
thaJeztah
requested changes
May 1, 2018
| @@ -40,6 +40,7 @@ Options: | |||
| -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 | |||
There was a problem hiding this comment.
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)
man/dockerd.8.md
Outdated
| @@ -22,6 +22,7 @@ dockerd - Enable daemon mode | |||
| [**-D**|**--debug**] | |||
| [**--default-gateway**[=*DEFAULT-GATEWAY*]] | |||
| [**--default-gateway-v6**[=*DEFAULT-GATEWAY-V6*]] | |||
| [**--default-address-pools**[=*DEFAULT-ADDRESS-POOLS*]] | |||
|
will correct it
…On Tue, May 1, 2018 at 8:17 AM, Sebastiaan van Stijn < ***@***.***> wrote:
***@***.**** requested changes on this pull request.
------------------------------
In docs/reference/commandline/dockerd.md
<#818 (comment)>:
> @@ -40,6 +40,7 @@ Options:
-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
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)
------------------------------
In man/dockerd.8.md
<#818 (comment)>:
> @@ -22,6 +22,7 @@ dockerd - Enable daemon mode
[**-D**|**--debug**]
[**--default-gateway**[=*DEFAULT-GATEWAY*]]
[**--default-gateway-v6**[=*DEFAULT-GATEWAY-V6*]]
+[**--default-address-pools**[=*DEFAULT-ADDRESS-POOLS*]]
same here
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#818 (review)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AKEKnxQIURxbluZ8L6fo7PtP20KLVw4aks5tuFJhgaJpZM4Rj1ue>
.
|
selansen
force-pushed
the
master
branch
2 times, most recently
from
43c360e
to
e949b50
Compare
|
I thought I pushed my changes but looks like I forgot to push it. updated @thaJeztah review comments. |
thaJeztah
reviewed
May 5, 2018
| @@ -1349,6 +1350,8 @@ This is a full example of the allowed configuration options on Linux: | |||
| ] | |||
| } | |||
| } | |||
| "default-address-pools":[{"base":"172.80.0.0/16","size":24}, | |||
There was a problem hiding this comment.
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 <[email protected]>
|
corrected it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is separate commit for CLI files to address PR
moby/moby#36054moby/moby#36396Signed-off-by: selansen [email protected]
- 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)