14989a215e
Register built-in engine commands at runtime instead of compile-time
...
This allows selective loading of commands, and paves the way to dynamic
plugins.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 919665a20a41f8e1b105342b1864ec05eb50cc97
Component: engine
2014-02-24 19:24:29 +00:00
e9b88ec705
Merge pull request #4153 from crosbymichael/move-proxy
...
Move proxy into pkg
Upstream-commit: 518670f3d82ad8f0a9568ef5231d5e4af26860b2
Component: engine
2014-02-17 14:51:16 -08:00
217301fcd0
Merge pull request #4030 from TheDude05/fix-incorrect-ip-test
...
Fix IPv4 Subnet Test
Upstream-commit: 2769d66f78dfd94f8cbd4bf1ff50b5c7a039b647
Component: engine
2014-02-17 14:41:33 -05:00
690b93143a
Move proxy into pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8c39db8f96ac2a7ec479a679bc060410cee1a567
Component: engine
2014-02-14 15:48:05 -08:00
a535869482
Adjust test to match its comment
...
Docker-DCO-1.1-Signed-off-by: Andrew Williams <williams.andrew@gmail.com > (github: TheDude05)
Upstream-commit: 95bcb8924ac2cbe0fb625a604d2c6d5a8e2fa06a
Component: engine
2014-02-09 15:36:04 -06:00
64b4ce5805
Add bidirectional iptables rule back to links
...
Fixes #4014
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 0cba91e26447e14260f111bef6d3745d2dd55444
Component: engine
2014-02-09 01:43:46 -08:00
79a6ce6a54
Check for nil information return
...
Fixes #3912
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: bbe382bec4b24d8aee09570f2c3920cc1c9710ca
Component: engine
2014-02-06 03:18:12 -08:00
2b1dbf920f
networkdriver: add ErrNoDefaultRoute
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: google)
Upstream-commit: 1b9c5edc6c7acbe894c4b2db3e3e4a1f1353ccc5
Component: engine
2014-02-03 14:27:59 -08:00
67b7b510b9
docker: detect defaultNetworkMtu from default route
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: google)
Upstream-commit: 4d0a026c98721da874a03f5b6993045bae95842a
Component: engine
2014-02-01 03:46:37 -08:00
3d90516a7c
Update code from pr #3842 post rebase
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: a11bee44d74235ec436c1b2272dc9f718497f88c
Component: engine
2014-01-31 12:04:44 -08:00
e1a338aef6
Fix port mapping unit tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 1d4de9ce1fe2c113cd7e9fcb6055b95c94c65b06
Component: engine
2014-01-31 12:04:44 -08:00
b6b8e6cc38
Move network aspect of links into driver as a job
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 167403988dca37060edf37abbdd28360ee0d5d4a
Component: engine
2014-01-31 12:04:44 -08:00
844634dcc8
Implement requesting the name ip
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 2df01661071e949faabf1fa9ba612c40710b686b
Component: engine
2014-01-31 12:04:44 -08:00
2879fa9100
Fix sending []byte in job env
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 2d8709696c80e992a5b20ba7a00ca3268c57c11c
Component: engine
2014-01-31 12:04:44 -08:00
0b250038dd
Update core calls to network drivers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: c712e74b45005e0f38297d254fb606aa18606d11
Component: engine
2014-01-31 12:04:44 -08:00
fcfec10c8e
Finish moving networking information into driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 90494600d357d01310d8da1310b6ad02f56de22c
Component: engine
2014-01-31 12:04:44 -08:00
aea7b45d61
Not not allocate networks first ip
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: d86c1b064dad349737b4a423fe8d0c42db4ca45e
Component: engine
2014-01-30 23:10:19 -08:00
4971da5034
Move port mapper tests out of core and into portmapper
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: b3b12f00593d96c6d0e93f9e333ee368278e871d
Component: engine
2014-01-28 17:10:13 -08:00
b8f930d15c
Initial move of port mapper code into sub pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 99756ef11fc2a3ae821bb412607e7e9b322f278a
Component: engine
2014-01-28 15:42:46 -08:00
fa1cce6c36
Fix issues from rebase on master
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 5e69b3837b26d1d1f7cd8b3c4f5b077ba642bd20
Component: engine
2014-01-26 14:07:43 -08:00
1feadd553a
Simplify logic for registering ports
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: da61b99b392657343df4dc221ba5cd9ad6b1c9e1
Component: engine
2014-01-26 14:01:38 -08:00
c14df520ff
Refactor to support multiple ip addresses
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: ac2a4e64106b28d7b05d1ee31716af365424ff83
Component: engine
2014-01-26 14:01:38 -08:00
c104696fd4
Add port allocator and move ipset into orderedintset
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 303ed3c8300183bab09a36b58e0c1db89d12424a
Component: engine
2014-01-26 14:01:38 -08:00
75afea3f4d
Update tests to have custom routes
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: b1d26985d0dfcbecc8264124fa81ff843a6d574b
Component: engine
2014-01-24 17:18:48 -08:00
57e87d938b
Refactor and fix register interface when bridge does not exist
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: ec73c232318a3dae803a27a6922f0af7117eec6e
Component: engine
2014-01-23 14:39:10 -08:00
e16cdc0102
Finalize core changes with new package
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: ea5b3e193ba40b65c38c774e9abb85340c52e8c6
Component: engine
2014-01-23 05:22:32 -08:00
7bb370a46e
Update code for new test cases
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 9d11db0f8c2be614f18eec856f11edbff5da17fe
Component: engine
2014-01-23 02:22:13 -08:00
f755b9590d
Move tests from core into ipallocator
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: fccca3542b91513dd0da73db21ffa3ced4dd9b7f
Component: engine
2014-01-23 01:31:38 -08:00
ce6ce4f2a7
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
...
Upstream-commit: 648357ffdf6670810383be6437b8a5f8a38d4e42
Component: engine
2014-01-23 00:28:35 -08:00
c4b5bd0ce8
Implement pos for set and add unit tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 79bb8212e05cc9c14b8edda2b8a924fef63ea2e0
Component: engine
2014-01-22 19:34:47 -08:00
ebcfd87643
Finish implementation and begin working on tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 6bc05899aa5023fdda0441b76a829d0e9a6f6dea
Component: engine
2014-01-22 18:05:20 -08:00
8a240a149a
Merge remote-tracking branch 'fork/stack_set' into move-networking
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 78b3d89f87bd6017416a48fcfd9118acd9910a51
Component: engine
2014-01-22 17:20:52 -08:00
fcb24c5b66
Use int32 instead of string for ip set
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: 3e3abdd770bdc23c409a9e49619a1897ffbf2354
Component: engine
2014-01-22 17:20:19 -08:00
acc4af4393
Merge remote-tracking branch 'fork/stack_set' into move-networking
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 9c29376fcb9c4c5e2217a7b10dfd81e09403184a
Component: engine
2014-01-22 17:13:13 -08:00
dda70b8c6c
Implement PullBack()
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: 18df387bf8a4a1419b6d3267a4e0551ff72b0f88
Component: engine
2014-01-22 17:12:28 -08:00
8e2415caf3
Merge remote-tracking branch 'fork/stack_set' into move-networking
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: b58c1a6438e5b72e6dfd5e498672669511a484f3
Component: engine
2014-01-22 16:24:55 -08:00
31d247bfc1
Merge remote-tracking branch 'fork/stack_set' into move-networking
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: e048c28159313ec7e3b55982b55ea0eba6befc6e
Component: engine
2014-01-22 16:13:59 -08:00
89dcf8ee2f
Implement Containers in set
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: 43bcbf06a663c5d8cac63f2af8fefef7edc5513a
Component: engine
2014-01-22 16:13:28 -08:00
ef69ef49b5
Implement get next ip
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: d32777f6b1f3a5dff6df0e285b9cd68b2c0d00ad
Component: engine
2014-01-22 16:13:22 -08:00
90791dd030
Implement basic stack for ips
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: 63d18d875b8a136d59c98b7b571366b10b5d4f76
Component: engine
2014-01-22 16:00:53 -08:00
5cb56f7078
WIP for ip allocator
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 9e2e8a923c28833dd631a7206d3664a6a90cc24c
Component: engine
2014-01-22 15:52:39 -08:00
