24ba808848
Merge pull request #3256 from alexlarsson/blkdiscard
...
Discard all data on devicemapper devices when deleting them
Upstream-commit: a60f0a07542b923f81adef2b56621a1eb712d008
Component: engine
2014-01-18 10:12:10 -08:00
068067c588
Fix Travis for PRs against non-master (like release, for example)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 980e0bf52c15bdf179c58b2d4f1085e26f8a3e2a
Component: engine
2014-01-18 10:41:37 -07:00
4100795860
refactor, remove useless buffers
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 455495f7caf1bf2ff9ea1364bbf2362d9737b54c
Component: engine
2014-01-17 18:54:02 -08:00
83cca3f4a4
Merge pull request #3638 from tianon/update-mailmap-authors
...
Update .mailmap and AUTHORS - we're up to 316 unique contributors by my count!
Upstream-commit: dc359e07d3d48202c7fe6168bd6cf5ab5b2725e9
Component: engine
2014-01-17 18:19:41 -08:00
ce11258e8e
Fix rebase for init error
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: d5112ffce60625e470515578ccd446a191dd9e88
Component: engine
2014-01-17 17:42:58 -08:00
95062bc2c2
Add todos for driver changes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 5c30c4379af20b3cbd2d20cc9f0ccb6f04ac63ab
Component: engine
2014-01-17 17:42:58 -08:00
96611d5300
Make sure drivers are registerd within sysinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 97c84507054a7379c8f8b461773b9c8d4972902b
Component: engine
2014-01-17 17:42:58 -08:00
3a041a0663
Change drvier name to append version
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: cdfebc2a20e76d4ea81eb154b748e0547a7e7ab5
Component: engine
2014-01-17 17:42:58 -08:00
8771a3eaee
Move lxc template into lxc driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 70a5cb95b31c7596886b7f94d292444654b9af8d
Component: engine
2014-01-17 17:42:58 -08:00
72a4c2e064
Rename Capabilities in sysinfo and move it to its own subpackage
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: crosbymichael)
Upstream-commit: 9e9f4b925b4b6a58a03bbff09150f1314d5fe3b2
Component: engine
2014-01-17 17:42:58 -08:00
d65bec8d4a
Small fixes to type names
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: ca8dd73fbfa7aca0768278ff1ff9671f80c48138
Component: engine
2014-01-17 17:42:22 -08:00
ae872300fb
Cleanup + add Info to driver in order to have specific IsRunning()
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: crosbymichael)
Upstream-commit: 889b4b10ae3ec1d6e7879c30860aafd7674cb576
Component: engine
2014-01-17 17:42:22 -08:00
ab79ba703f
Move docker init into drivers functions
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: crosbymichael)
Upstream-commit: f7684ea7f61c0c69033c27605e9ad9a0a76e74cd
Component: engine
2014-01-17 17:42:22 -08:00
99f003c9e7
Make sure proc is umounted for chroot driver within init
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: d3bae131d6fa10dd1c25077204bf2c3274a3b8cc
Component: engine
2014-01-17 17:42:22 -08:00
ecb354d61e
Improve wait for lxc and driver interface
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8c9f62d037a1bc82742ea316adaaf658af56b7c3
Component: engine
2014-01-17 17:42:22 -08:00
61d0d163e4
Use utils.Go to get error from monitor
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: c2b602b2ac7b5b3a67dbb7945e97a9f48b1a625e
Component: engine
2014-01-17 17:42:22 -08:00
749c5a2471
Add json tags and comments to exedriver types
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: e765c67b477308643c8b1b4f84bee3572bf5ec98
Component: engine
2014-01-17 17:42:22 -08:00
016a7317fc
Simplify chroot wait, address code review issues
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: f3f2456b0451d93a539eac63dac93a748e01317f
Component: engine
2014-01-17 17:42:22 -08:00
1e6d4ad1dd
Move setup pty and standard pipes to funcs
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8a38ead21993dd500280ae427895363a2de8be8a
Component: engine
2014-01-17 17:42:22 -08:00
b7aec1007b
Remove SysinitPath from process
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 1e81387edcab600c9b8bc2a502988f7b3a2013e7
Component: engine
2014-01-17 17:42:22 -08:00
28c45914a4
Make exec driver run a blocking command
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: f846ecdc77bb9ab4d44b41a2e403bcf579d6b6e9
Component: engine
2014-01-17 17:42:22 -08:00
653b7f7ad7
Improve chroot driver by mounting proc
...
Add -driver flag to dockerinit
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 92e6db7beba8ad58e425119cc9885c355a5755e7
Component: engine
2014-01-17 17:42:22 -08:00
98268ad2c1
Add chroot driver for testing
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8e0741f5e40d107780a5be1f6ae0f4d30ba43d7d
Component: engine
2014-01-17 17:42:22 -08:00
9b96c8681d
Move RootIsShared to lxc driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 1d8455e6838f2630221eb3fcafeb382f9f7ce260
Component: engine
2014-01-17 17:42:22 -08:00
695537a626
Update with lxc unconfined changes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 93ead2fe789a3a94a8433b12efcca782e0a7d7de
Component: engine
2014-01-17 17:42:22 -08:00
ecb0de6cea
Fix network disabled for container
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 66782730b85db20600ce48fcab203a5eb43bcb02
Component: engine
2014-01-17 17:42:22 -08:00
f7fe9669ce
Fix race in set running
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 77936ba1a1ff404b75ae8a34c6d4e280c23d9144
Component: engine
2014-01-17 17:42:22 -08:00
2e99b888c2
Fix race in cleanup
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 381d593d04fc46dac5b202d047981e15183c5ed1
Component: engine
2014-01-17 17:42:22 -08:00
1e4d16ab41
Fix race in TestRun
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: ad9710685ca3ae101c84a57c7d68a25cba4bede2
Component: engine
2014-01-17 17:42:22 -08:00
8eebe6db05
Update with container specific waitLock
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8b60273f76723897a9831ca125500ede85e05b5d
Component: engine
2014-01-17 17:42:22 -08:00
a8716549d6
Rework monitor and waitlock inside of driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 8e87835968a4c6233406061759e3dca03ab86989
Component: engine
2014-01-17 17:42:22 -08:00
f9406fce53
WIP complete integration test run
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 5a3d9bd432fdaa95f870d4d99fad1d6fafeaad92
Component: engine
2014-01-17 17:42:21 -08:00
c1bfdbf247
Fix tty set issue for ioctl error
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 1c1cf54b0aa44553b714b82a1960b4f1199ac33a
Component: engine
2014-01-17 17:42:21 -08:00
d4ff7dd42c
Embed exec.Cmd on Process
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 5573c744e4be16f39e1491188c4d4ff43f61d549
Component: engine
2014-01-17 17:42:21 -08:00
50773ecc52
Keep state in core on container
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 25a26977173632b5966838d910550a921ef5a853
Component: engine
2014-01-17 17:42:21 -08:00
dc2dffef1c
Integrate process changes in container.go
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: f2680e5a5b1fc2393dfe319fe4dd197672985411
Component: engine
2014-01-17 17:42:21 -08:00
b31f0efb11
Implement lxc driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 203b69c8c907b9cf57c887774b6f492d405a0621
Component: engine
2014-01-17 17:42:21 -08:00
e22470a748
Initial driver changes proposal
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 1ceb049118e16367c2f4015e61657f03d0eb8e29
Component: engine
2014-01-17 17:42:21 -08:00
f81b6be780
Merge pull request #3647 from vieux/refactor_registers
...
refactor registers
Upstream-commit: a823d7967ff7d456954351b173736c65b9d75ef6
Component: engine
2014-01-17 17:39:54 -08:00
7822beced6
update commands.go
...
update docker.go
move to pkg
update docs
update name and copyright
change --sinceId to --since-id, update completion and docs
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor@docker.com > (github: vieux)
Upstream-commit: e71dbf4ee5add5736f595948fc20bd01af56a744
Component: engine
2014-01-17 17:33:15 -08:00
5a3d223b61
refactor registers
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 3ff5f2374cf7d68c0905840a571c521d79c7e091
Component: engine
2014-01-17 16:57:43 -08:00
9ba5452f29
netlink: make darwin happy
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: 77d9fd262828c0c626b2093e8a62e05cc130905e
Component: engine
2014-01-17 16:55:42 -08:00
5a27089624
netlink: move Route type to common arch file
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: dadd54dba395f68c492a8ce5e2bf9488f9db0830
Component: engine
2014-01-17 14:04:11 -08:00
31ec62f475
Merge pull request #3620 from jamtur01/refman
...
Added Reference Manual
Upstream-commit: ebaa92b20879339e66bfd995a340a235cfb25046
Component: engine
2014-01-17 13:42:22 -08:00
0b2aee47b9
Added Reference Manual
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 89ff488b55c9ebb8d458508df035cac0c55ee01c
Component: engine
2014-01-17 15:29:32 -05:00
c887dfefdf
Merge pull request #3641 from gfrey/fix_compression
...
detect compressed archives in API /build call
Upstream-commit: 941d4ffa3e8e6c74fd02f3ac81a66c64dda3bc58
Component: engine
2014-01-17 12:02:54 -08:00
89d377fc23
Merge pull request #3632 from crosbymichael/stream-cp
...
Stream the cp operation on the client
Upstream-commit: 2f066aef495a63d3d02940ba7c839cc4f3888aed
Component: engine
2014-01-17 11:29:51 -08:00
06869c7c04
network: exclude default routes from checkRouteOverlaps
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: a886fbfa4a01f7d73c9c2d836da89ecf23a40a33
Component: engine
2014-01-17 11:09:53 -08:00
52d25202bf
netlink: add default Route to NetworkGetRoutes
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: 26726dc9ff3ac8ccc7f40f7672e6494d0e77611d
Component: engine
2014-01-17 11:09:50 -08:00
83517b0f69
Replace creating buffer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 95df957f73f4e7bb7225111bd4a4b4ff337af529
Component: engine
2014-01-17 11:02:44 -08:00