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

12 Commits

Author SHA1 Message Date
Michael Crosby
6a68c558b1 Merge pull request #6371 from jpetazzo/6370-masquerade 
Select masquerade by outgoing interface rather than by destination subne...
Upstream-commit: bcec0f30e8d7dbb9fcdd6a85fa4b8e4953ba66ff
Component: engine
 2014-07-07 10:28:31 -07:00
Erik Hollensbe
4ad46ffe31 Use last allocated port logic in port allocator 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: e77729c2e081c5ce55aa1d4f316b7c7703e5de96
Component: engine
 2014-06-27 10:51:26 -07:00
Erik Hollensbe
52ddc2736f Make ErrPortAlreadyAllocated an error interface with a few extras, 
adjust tests to fit.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: ffd68badc0a3d70fbd063903702355a387621b10
Component: engine
 2014-06-27 10:51:25 -07:00
Arnaud Porterie
187971736c Restrict portallocator to Docker allocated ports 
Port allocation status is stored in a global map: a port detected in use will remain as such for the lifetime of the daemon. Change the behavior to only mark as allocated ports which are claimed by Docker itself (which we can trust to properly remove from the allocation map once released). Ports allocated by other applications will always be retried to account for the eventually of the port having been released.

Docker-DCO-1.1-Signed-off-by: Arnaud Porterie <icecrime@gmail.com> (github: icecrime)
Upstream-commit: dafddf461eeabd792d9ced6caced75ad6961c1d7
Component: engine
 2014-06-27 10:51:25 -07:00
Jérôme Petazzoni
363db75bc0 Select masquerade by outgoing interface rather than by destination subnet 
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com> (github: jpetazzo)
Upstream-commit: a084f4bc61a81eb9076246d85d6cc5168b32a949
Component: engine
 2014-06-11 17:09:19 -07:00
Michael Crosby
52b8a282c3 Update libcontainer imports 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8194556337b65dda71a3d4d7f6ae9653ad5a19a0
Component: engine
 2014-06-10 19:58:15 -07:00
Michael Crosby
3c7670e68c Move libcontainer deps into libcontainer 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 6158ccad97db51e756aafefb096d1163aa4d6439
Component: engine
 2014-06-09 15:52:12 -07:00
Alexandr Morozov
bfa0c1d204 Fix races in set/get currentInterfaces in networkdriver 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 4e5f6951f2af836c3d9163c8a150298ee87468d4
Component: engine
 2014-05-30 14:16:00 +04:00
Erik Hollensbe
1e8e32fb77 bridge: retry any proxy set up failures until we get a successful port, defeats a race condition 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 91ba3379312a74132e2578d167c9e36eeb889525
Component: engine
 2014-05-21 09:14:53 -07:00
Victor Vieux
ac35d8965e add resolvconf 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 3744452ecf46351758478e99795e20b186a1bee4
Component: engine
 2014-05-05 22:55:32 +00:00
Tibor Vass
74d365d59a Fix bridge ip comparison 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 986c647d5ac9bda0633cdeb927bb782d8df02269
Component: engine
 2014-04-30 12:36:16 -07:00
Alexander Larsson
f7be50364d Rename runtime/* to daemon/* 
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 359b7df5d2af5733b8a1ea6746d062053053b23e
Component: engine
 2014-04-17 14:43:01 -07:00