-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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.
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
Add a default value for the docker.network configuration #3471
Merged
traefiker
merged 10 commits into
traefik:master
from
jbdoumenjou:feature/default-docker-network
Jun 13, 2018
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
f276730
Add the 'default network' option to the Docker provider
jbdoumenjou a99597a
update the documentation
jbdoumenjou 5bac6ea
Fix for review - update the documentation
jbdoumenjou c103f95
Fix for review - renamed network by defaultNetwork
jbdoumenjou 4cf4031
Fix for review - add some unit tests
jbdoumenjou 6455db1
Fix for review - misspelling
jbdoumenjou 5313ffe
Revert "Fix for review - renamed network by defaultNetwork"
jbdoumenjou 79385a3
Fix for review - update the tests with 'Network' instead of 'DefaultN…
jbdoumenjou 50f47ae
Fix for review - update the documentation
jbdoumenjou 14ff5bd
review.
ldez File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -45,6 +45,7 @@ type Provider struct { | |
ExposedByDefault bool `description:"Expose containers by default" export:"true"` | ||
UseBindPortIP bool `description:"Use the ip address from the bound port, rather than from the inner network" export:"true"` | ||
SwarmMode bool `description:"Use Docker on Swarm Mode" export:"true"` | ||
Network string `description:"Default Docker network used" export:"true"` | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Shouldn't we call it There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. To be homogeneous with |
||
} | ||
|
||
// dockerData holds the need data to the Provider p | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we should add the fact that it's possible to override this with the label
traefik.docker.network
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done