Allow docker0 CIDR to be specified #22
Merged
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
added 4 commits
February 24, 2014 14:59
* bridge_utils needed to be installed * docker0 interface needed to be shutdown * docker0 interface needed to be deleted * args passed to docker needed to be updated
|
Nicely done, a hairy setup but as clean as possible, given the circumstances 😄 |
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.
NOTE: This pull request depends on #21
Problem
Using dvm in an environment where the default network range for Docker (
172.16.42.1/24) conflicts with the local network, containers are unable to reach any hosts on the local network.Docker allows passing in the
--bip=""option to set the CIDR range for thedocker0bridge it creates. However, this alone is not enough. Since Docker will have already been started once, thedocker0bridge will already exist with the conflicting network range, causing the--bipoption to take no effect.Solution
docker0bridge, I've added the configuration directiveDOCKER0_CIDRtodvm.conf.docker0previously existing, thebridge-utilspackage is installed to providebrctl(I did check busybox first to make sure it was not already included), which is then used to remove thedocker0bridge before starting Docker with the new arguments.