Commit Graph

5185 Commits

Author SHA1 Message Date
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
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
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
38c89dc581 Stream the cp operation on the client
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: fdd8d4b7d9dbc32a76a708d0d51c201cf9c977f0
Component: engine
2014-01-17 10:51:29 -08:00
a4e0978f9e Merge pull request #3637 from crosbymichael/no-panic-on-exec
Return error and not panic when cannot exec in dockerinit
Upstream-commit: b4e5bfbf6f17b92a12ed2a8f4fafab53fac5f0ad
Component: engine
2014-01-17 10:42:46 -08:00
8aad44e0a2 Merge pull request #3635 from vieux/top_job
move Top to a job
Upstream-commit: 6188d7ef66ee41022c596248212c083a850501f2
Component: engine
2014-01-17 10:19:28 -08:00
0aa4f1bddd detect compressed archives in API /build call
AFAIK in some previous version it was possible to give a compressed docker file
to the API's build command and that was handled properly (aka compression was
detected and archive uncompressed accordingly). Fails with at least 0.7.5.

Fixed this using the DecompressStream method from the archive package.

Docker-DCO-1.1-Signed-off-by: Gereon Frey <me@gereonfrey.de> (github: gfrey)
Upstream-commit: 4f53722dee6c8ea18a9c30bde2cc6fee24b03d32
Component: engine
2014-01-17 12:21:26 +01:00
4679c4e1e7 Return error and not panic when cannot exec in dockerinit
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 11ef2f0db46b8507007c740300fbf486934aa996
Component: engine
2014-01-16 18:31:21 -08:00
929d2cae05 Merge pull request #3624 from tianon/vendor-maintainers
Symlink vendor/MAINTAINERS over to hack/MAINTAINERS
Upstream-commit: d6b810c32e72c21a1c7fce5f3157c78457d7a8b2
Component: engine
2014-01-16 17:58:28 -08:00
282dfddd17 Merge pull request #3599 from tianon/fix-install-sed
Fix release.sh sed of install.sh so we preserve tests against 'https://get.docker.io/'
Upstream-commit: 59fe36623bae670f2b973a8e558e57b69197b5d9
Component: engine
2014-01-16 16:54:39 -08:00
5507216edb Merge pull request #3625 from tianon/cleanup-vendor-sh
Clean and simplify vendor.sh while making it easier to maintain as well
Upstream-commit: 93ce4d2c0b2dcebd9e763efd0432f45811a3d8d2
Component: engine
2014-01-16 16:42:52 -08:00
1de8e12295 clean up test log
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 8cbabf2c3e24b6fc0f676a8696133742622f7249
Component: engine
2014-01-16 16:07:42 -08:00
58e92d3536 move top job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 812798a7d6659178300d00c470a19c7fe5e68d1c
Component: engine
2014-01-16 16:07:42 -08:00
5d03c66795 Merge pull request #3616 from vieux/job_changes
move changes to a job
Upstream-commit: 3155ef5cbc99862e9179a99e2a024701efb3aa80
Component: engine
2014-01-16 15:52:57 -08:00
f6132defa4 Merge pull request #3583 from metalivedev/3497-copyright
Update docs/NOTICE copyrights to 2014
Upstream-commit: 2cdbc719c58978bc9d23098b45b473d17956dae0
Component: engine
2014-01-16 12:18:34 -08:00
8f3a13dc70 Clean and simplify vendor.sh while making it easier to maintain as well
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 40b40cffb13758c03eff2cf05b1e5b0aa47bdb9d
Component: engine
2014-01-15 22:20:51 -07:00
d2be7a9f69 Symlink vendor/MAINTAINERS over to hack/MAINTAINERS (since it depends explicitly on hack/vendor.sh)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 98111a4a94b8fdc0a44a1c7bfba2e83fbd0f9534
Component: engine
2014-01-15 22:12:32 -07:00
ec9f60e58d move changes to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 90ec5de430a79ab6b145899a9842c1db968341cf
Component: engine
2014-01-15 17:13:45 -08:00
d902ac68ad move search to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 1669b802cc3e7ce30f05e61630542c88696bbca1
Component: engine
2014-01-15 17:12:48 -08:00
547b5e1700 move attach to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: e1d8543c7889c1bf456641fa1ee5f676820076b6
Component: engine
2014-01-15 17:11:44 -08:00
0b0bfe2b31 fix docker insert display
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 2edcebc0275b726e87575830bb3e96dfb69d7665
Component: engine
2014-01-15 15:41:57 -08:00
9b65fcb5fa use the same 'Used' method as before
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: a33bc3018bf091725b7faca9a6039a07b6fd0ca7
Component: engine
2014-01-15 14:52:58 -08:00
42a6830aeb move insert to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 0fb8a55753269603eb8f01f725675ceacae79c29
Component: engine
2014-01-15 14:52:58 -08:00
d269d9c059 move copy to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: e2fa3f56df02818f007f929824293f9da6b2db75
Component: engine
2014-01-15 14:48:31 -08:00
0ffae81311 Merge pull request #3613 from vieux/deprecated_viz_job
move viz to a job
Upstream-commit: f213e2dd6cd6445f59f1e7262783a754a5352dc2
Component: engine
2014-01-15 14:47:56 -08:00
80f9949adc update TODO
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: a98e40fa73cdba36b7a7032917e58233ef31ea59
Component: engine
2014-01-15 14:47:35 -08:00
e18203d1c4 move viz to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 7fbc315aa96f75322643c3e94b418fead6925144
Component: engine
2014-01-15 13:52:35 -08:00
b04df34a21 Merge pull request #3598 from tianon/fix-vieux-docs-errors-again
Fix odd issues with "make docs", add "make docs-shell", and canonicalize...
Upstream-commit: cdea7d3b5f64b8d255bab657a79082ec282da96a
Component: engine
2014-01-15 13:42:28 -08:00