p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,436 Commits 2 Branches 295 Tags
ee1f88fe1bee85ea1fffafe12499b3a036e2fb21
Commit Graph

15 Commits

Author SHA1 Message Date
Daniel Norberg
8a00f43f92 bridge driver: clean up error returns 
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
Upstream-commit: d4746d3ea0b8d4888b21b808237199ae22525b07
Component: engine
 2014-04-10 11:26:48 -04:00
Daniel Norberg
6bee2b968e net: do not create -b/--bridge specified bridge 
If the bridge specified using -b/--bridge doesn't
exist, fail instead of attempting to create it.

This is consistent with the docker documentation
on -b/--bridge: "Attach containers to a pre
existing network bridge". 

It is also less surprising in an environment where
the operator expected the bridge to be properly
set up before docker starts and expects docker to
fail fast if the bridge was not up instead of
masking this error and coming up in some
potentially broken state.

With this patch, docker still creates docker0 if
needed and no bridge was explicitly specified.

Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
Upstream-commit: 336199a877014143bac462e98cae7f59525a0556
Component: engine
 2014-04-10 11:11:17 -04:00
unclejack
d7e849e505 Merge pull request #4931 from crosbymichael/gen-mac-addr-for-bridge 
Set bridge mac addr on supported kernels
Upstream-commit: ceed9382d0b361018a57ec96e163c3c30198cbd0
Component: engine
 2014-04-02 02:47:56 +03:00
Michael Crosby
45bf7e9540 Update test to reallocate port 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 6b7cfc9e95af8510abc801a02cda7879e4f82518
Component: engine
 2014-04-01 07:27:34 +00:00
tjmehta
69f1eddd56 make findNextPort circular, add all-ports-allocated error 
Docker-DCO-1.1-Signed-off-by: Tejesh Mehta <tejesh.mehta@gmail.com> (github: tjmehta)
Upstream-commit: 739d1244807bc3522a0af4dc3490305d6f037601
Component: engine
 2014-03-31 22:21:52 -07:00
Michael Crosby
a4e4b56b6e Set bridge mac addr on supported kernels 
Fixes #3200
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 4cdcea20474a9f42291fe6b6c6dee348343a7c05
Component: engine
 2014-03-31 22:56:23 +00:00
Michael Crosby
7c744319b0 Return error when existing bridge does not match ip 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: baba9cde9542b480162d11bd30ca3a522fa6b4d0
Component: engine
 2014-03-26 11:51:27 +00:00
Victor Vieux
da42bdb7df Merge pull request #4628 from kippandrew/port-allocator 
Fix port collision with dynamically allocated ports
Upstream-commit: abef5cb0fcd107c751b7390bc7eb45e3ecd675e6
Component: engine
 2014-03-25 14:30:10 -07:00
Victor Vieux
2352431354 rename lxc to bridge 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 8944fb2e9b07d5a764f8d48065b9afd73364f640
Component: engine
 2014-03-20 21:51:28 +00:00
Andy Kipp
7976f94412 Add err checks for port allocator tests 
Docker-DCO-1.1-Signed-off-by: Andy Kipp <andy@rstudio.com> (github: kippandrew)
Upstream-commit: 555416fd02b9e062385dcdaf0c4b9f5de61df388
Component: engine
 2014-03-18 13:30:21 -04:00
Andy Kipp
0ed607c3a6 Be more explicit in finding next port to allocate 
Docker-DCO-1.1-Signed-off-by: Andy Kipp <andy@rstudio.com> (github: kippandrew)
Upstream-commit: 73c416a20db8fe48302a6cf0db4c1c0585ed0739
Component: engine
 2014-03-18 13:30:21 -04:00
Andy Kipp
9ecda2cf3a Better test error message 
Docker-DCO-1.1-Signed-off-by: Andy Kipp <andy@rstudio.com> (github: kippandrew)
Upstream-commit: 7a1db291fcedd50ce99649e95109187c76da255c
Component: engine
 2014-03-18 13:30:21 -04:00
Andy Kipp
dc2e6deab9 Prevent dynamic allocation of previously allocated ports 
Docker-DCO-1.1-Signed-off-by: Andy Kipp <andy@rstudio.com> (github: kippandrew)
Upstream-commit: f7b6fbbd7664634481c8519e58844d572423f3e1
Component: engine
 2014-03-18 13:30:21 -04:00
Michael Crosby
8d099b8012 Gofmt imports 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 2bddcd68b4b927d36ffadd80e098f6d4ae2cf5d6
Component: engine
 2014-03-17 11:41:28 -07:00
Michael Crosby
4b7a6e2613 Move networking drivers into runtime top level pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 2230c9b9a735d731cc2fee4137633eb98b9da9d5
Component: engine
 2014-03-17 11:40:12 -07:00