Skip to content

Remove ability to join bridge network + user-defined networks#2761

Merged
aanand merged 2 commits intodocker:masterfrom
aanand:fix-bridge-plus-host
Jan 27, 2016
Merged

Remove ability to join bridge network + user-defined networks#2761
aanand merged 2 commits intodocker:masterfrom
aanand:fix-bridge-plus-host

Conversation

@aanand
Copy link
Copy Markdown

@aanand aanand commented Jan 27, 2016

Incorporates #2757.

Containers connected to the bridge network can't have aliases, so it's simpler to rule that they can either be connected to the bridge network (via network_mode: bridge) or be connected to user-defined networks (via networks or the default network).

shin- and others added 2 commits January 27, 2016 00:36
Signed-off-by: Joffrey F <joffrey@docker.com>
Containers connected to the bridge network can't have aliases, so it's
simpler to rule that they can *either* be connected to the bridge
network (via `network_mode: bridge`) *or* be connected to user-defined
networks (via `networks` or the default network).

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
@shin-
Copy link
Copy Markdown

shin- commented Jan 27, 2016

LGTM!

@shin- shin- mentioned this pull request Jan 27, 2016
aanand added a commit that referenced this pull request Jan 27, 2016
Remove ability to join bridge network + user-defined networks
@aanand aanand merged commit ca81672 into docker:master Jan 27, 2016
@aanand aanand deleted the fix-bridge-plus-host branch January 27, 2016 01:41
@aanand
Copy link
Copy Markdown
Author

aanand commented Jan 27, 2016

Cherry-picked into #2753

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

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants