Skip to content
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

Remove BridgeIP from ipallocation pool #9975

Merged
merged 1 commit into from
Jan 8, 2015

Conversation

MalteJ
Copy link
Contributor

@MalteJ MalteJ commented Jan 8, 2015

Fixes #9938

The Bridge IP will be allocated during Docker network driver initialization.

Apart from that I have removed to update the next/last pointer in the ipallocation logic when a specific IP address is requested.
Currently when you request a specific IP address manually for container A, a container B that will be created afterwards will get the IP address of container A + 1.
With my changes in daemon/networkdriver/ipallocator/allocator.go container B will get the last automatically assigned IP address + 1.

Closes moby#9938

Signed-off-by: Malte Janduda <mail@janduda.net>
@MalteJ
Copy link
Contributor Author

MalteJ commented Jan 8, 2015

ping @LK4D4

@jessfraz
Copy link
Contributor

jessfraz commented Jan 8, 2015

This also closes #9949

@LK4D4
Copy link
Contributor

LK4D4 commented Jan 8, 2015

LGTM
But probably we can merge #9971 and write test for this. But maybe in other PR.
@MalteJ Could you post an issue about test after merge?

@MalteJ
Copy link
Contributor Author

MalteJ commented Jan 8, 2015

@LK4D4 OK

@jessfraz
Copy link
Contributor

jessfraz commented Jan 8, 2015

LGTM
@LK4D4 which one do you want to merge first of this an #9771 or does it not matter?

@LK4D4
Copy link
Contributor

LK4D4 commented Jan 8, 2015

@jfrazelle #9771 seems like UX. So this will be fine.

jessfraz pushed a commit that referenced this pull request Jan 8, 2015
Remove BridgeIP from ipallocation pool
@jessfraz jessfraz merged commit c438900 into moby:master Jan 8, 2015
@MalteJ MalteJ deleted the dont-allocate-bridgeip branch January 8, 2015 23:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

the ip of docker container shoud not be 172.17.42.1/16.
3 participants