Commit Graph

271 Commits

Author SHA1 Message Date
Andrea Luzzardi 9c18c9de84 docker: Make sure to umount the container if it's still mounted at
destruction
Upstream-commit: fb40a7880494afffe384ac955f5f4e3a4971c676
Component: engine
2013-01-28 12:00:20 -08:00
Andrea Luzzardi c2dc6c5c0b Filesystem: Re-implemented Umount() and IsMounted() to work around AUFS
issues.

Umount() will now attempt to remove the mntpoint after umounting.
It will keep retrying for some time until the mntpoint is deleted.
Upstream-commit: 174f25909c525015cb84f1b82376091a1ac9c118
Component: engine
2013-01-28 11:58:47 -08:00
Andrea Luzzardi 9632a09e60 Added sequential and parallel benchmarks in order to stress test docker
(create, run, destroy workflow)
Upstream-commit: a2d7dd1a1908fc3dc6ac5648b5ea12eaecb19b1b
Component: engine
2013-01-28 11:51:51 -08:00
Andrea Luzzardi 7b5bb8d40c filesystem: Added IsMounted() unit tests
Upstream-commit: d8bc912238dfa75dff0902b9d97133e200807bea
Component: engine
2013-01-28 11:51:41 -08:00
Solomon Hykes 8802c173bf Convenience logging in rcli
Upstream-commit: 54532e2ab709a25943a9d0b470ecf5c155deee5f
Component: engine
2013-01-27 15:43:08 -08:00
Solomon Hykes 0dd4a9f417 Experimenting with a UI which differentiates images and containers
Upstream-commit: 904b0ab52b065025acbdba6fdc056ef1dff04d44
Component: engine
2013-01-27 15:42:42 -08:00
Solomon Hykes a61c8ab5e5 Added various debugging commands: cat, write, ls, inspect, mount, umount
Upstream-commit: 6df37208be269540a6f291448491bf5de9f46c96
Component: engine
2013-01-27 01:08:34 -08:00
Solomon Hykes ae634b26df Fixed bug which caused 'docker stop' to crash when specifying a non-existing container.
Upstream-commit: 55a7560436d380405c807b187e67a2cd3eaf5e51
Component: engine
2013-01-27 01:07:21 -08:00
Solomon Hykes cc23af2ae6 Fixed a bug which caused Container.Start() to fail when the rootfs was already mounted.
Upstream-commit: fc19a00103f25e4d3bd1102803b32bea299d3fd6
Component: engine
2013-01-27 01:06:02 -08:00
Solomon Hykes 58ab0c3fc4 Removed dependency on docker.fake. Added extra information to 'docker list': Pid, Exit code, Mounted
Upstream-commit: e920cb9cd921053ebbc82ddccc35908d1def88bd
Component: engine
2013-01-27 01:04:33 -08:00
Solomon Hykes e87565c8da docker tar: stream the contents of a container as a tar archive
Upstream-commit: 37035363031db161732b5757485bec37ef429fb2
Component: engine
2013-01-27 00:59:49 -08:00
Solomon Hykes 2787997349 Create empty mountpoints (./rw and ./rootfs) every time we create or load a container
Upstream-commit: b6fb5bb21b73c90ae1833e32867781824f66ffb7
Component: engine
2013-01-27 00:49:09 -08:00
Solomon Hykes 12fbbf0518 Plugged 4 more commands into the real backend: 'diff', 'reset', 'run', 'stop'. 'run' actually runs the process, but doesn't capture outptu properly, and encounters mount issues
Upstream-commit: 5d6dd22fb2d689f98cadba6b7317658331307f3e
Component: engine
2013-01-26 15:56:42 -08:00
Solomon Hykes 001d53c5f0 Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: dbc7fb757541260b75ef5a77176b77bb3fd99944
Component: engine
2013-01-25 18:02:56 -08:00
Andrea Luzzardi 488ccc535c Fixed a bug preventing containers from running after being restored
Upstream-commit: 6513a1d94ed25a5f99b1e3d1670781f7597f9d35
Component: engine
2013-01-25 16:20:34 -08:00
Solomon Hykes 0fdf1beadc Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: fca26254908387b96ed824c16199875955123928
Component: engine
2013-01-25 15:42:43 -08:00
Andrea Luzzardi d69e225ffb container: Fixed a bunch of race conditions by getting rid of lxc-wait.
Upstream-commit: f4e25694c15583ed6ed290aff0c29116f7ed361e
Component: engine
2013-01-25 15:36:47 -08:00
Solomon Hykes 9e5cf65e8a First integration of the actual docker package into the server. Pull and put create actual containers. Rm actually removes them. The rest is still fake.
Upstream-commit: b397ce5dea4c0a34c73bc6d18fbcb76fa7c92ef0
Component: engine
2013-01-25 14:44:16 -08:00
Solomon Hykes 10dcbda36f Container.SetUserData() and GetUserData(): attach optional user data to a container
Upstream-commit: 11b65a00c66422a11d114260057384c59f5be4e2
Component: engine
2013-01-25 14:39:02 -08:00
Andrea Luzzardi 05f939e0c7 Merge branch 'master' of github.com:dotcloud/docker
Upstream-commit: 1df9819b257e2947c99c88973cc4cb7917b5ff62
Component: engine
2013-01-25 14:09:54 -08:00
Andrea Luzzardi 28021d1889 Docker: Fixed an issue with container unmarshaling which prevented
docker.restore() to work properly.
Upstream-commit: 2193b0c954e2fc9ce92fefa4e3b5a6c82ae98a3f
Component: engine
2013-01-25 14:09:21 -08:00
Solomon Hykes 52ec2891d6 'docker run -t': allocate a pseudo-tty for interactive mode (disabled by default)
Upstream-commit: 851812f1c657598007a35e1bb1dfc7047b91bd09
Component: engine
2013-01-25 11:33:18 -08:00
Solomon Hykes fd923fb16a First implementation of a layer store. 'docker pull' and 'docker put' now really work (but containers are still fake)
Upstream-commit: c885a05bdf337864f50443ae6dc5795ce55533ca
Component: engine
2013-01-25 11:32:37 -08:00
Solomon Hykes 1bc20b18f2 rcli.DialTCP(): return a net.TCPConn to allow TCP-specific operations (ie. half-close)
Upstream-commit: 63fc3e5ab38893e1359f218a855908a4c0303ace
Component: engine
2013-01-25 11:27:47 -08:00
Solomon Hykes 34fa02708d Fixed IO edge cases on docker client. Wait for stdin to close before exiting if it's a pipe, but not if it's a terminal. Correctly send stdin EOF to the server with TCP half-close
Upstream-commit: 75529a202f65e7df5395e0eca7d58aaa7718489c
Component: engine
2013-01-25 11:26:18 -08:00
Solomon Hykes 5ddc825ec6 Moved more utilities to docker/future
Upstream-commit: 401dd3d8e02f720e5e3b2a0f337a57af41fa29c4
Component: engine
2013-01-25 11:23:18 -08:00
Andrea Luzzardi 8a21f0d542 Merge branch 'master' of github.com:dotcloud/docker
Upstream-commit: 9b300272df3faed12033c5c55b75cc05c9bbb3f3
Component: engine
2013-01-25 11:06:07 -08:00
Andrea Luzzardi 64bc4b3350 Filesystem: Changes API
Upstream-commit: 09502e4faa76fddf6245db3c3281e9a70beda076
Component: engine
2013-01-25 11:05:11 -08:00
Solomon Hykes 9dc7d71f11 Factored out docker/rcli (remote cli protocol), docker/fake (mocking utilities) and docker/future (real utilities which don't yet fit in the core)
Upstream-commit: f3ffba7afef9d5caf5eca47e23eda0a2974dd04d
Component: engine
2013-01-24 20:01:32 -08:00
Andrea Luzzardi 3158de6ca9 Merge branch 'master' of github.com:dotcloud/docker
Upstream-commit: 4fc390ee39b5cafdb90376edcb5f718534afdf5f
Component: engine
2013-01-24 18:11:08 -08:00
Solomon Hykes 9772e0b30b Enabled stdin and interactive mode. 'docker run -a CONTAINER bash' will now correctly run an interactive shell. This required switching to a simple raw TCP protocol by default
Upstream-commit: 553ca56d7ed6f5808c97356b9bd4f6a5a3d20477
Component: engine
2013-01-23 23:14:46 -08:00
Andrea Luzzardi 1abf5fbe3a filesystem tests: Added a newTestFilesystem help function to remove
duplicate code
Upstream-commit: 06d8f7ce63d54d117a8245ccdbd84cfc90dfdd6b
Component: engine
2013-01-23 17:18:07 -08:00
Solomon Hykes 73224422be Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: 98f090ead89f30ab9f5b8568e4343479325526a9
Component: engine
2013-01-22 18:58:04 -08:00
Solomon Hykes 0faf2ae661 GFR model: Get, Fork, Run. There are no more layers, only containers
Upstream-commit: 1a77a32a839070e60f187478ce2da382c98d19bf
Component: engine
2013-01-22 18:29:44 -08:00
Andrea Luzzardi 358dcc8f2a go fmt
Upstream-commit: 73d7265429261029b7e6345821e9efe4ec37b10a
Component: engine
2013-01-22 17:30:37 -08:00
Andrea Luzzardi f33d685f66 Fixed lxc-wait race condition. Added unit test to try running multiple
containers in parallel.
Upstream-commit: f958bdba8a7c1c62f2f6e3e7bc2ddf1599029ecf
Component: engine
2013-01-22 17:30:09 -08:00
Andrea Luzzardi 47356dc54b Restart() implementation
Upstream-commit: f0c08b57abb6e273b54b3f6d253acfe7b0107972
Component: engine
2013-01-22 15:03:40 -08:00
Andrea Luzzardi 37ddcb4a4a State: Keep track of the container start time
Upstream-commit: 64fc86fba760dd5cb34cd6d9f3ddf13dc3dc4280
Component: engine
2013-01-22 15:03:27 -08:00
Andrea Luzzardi d26b69de49 Filesystem: Perform syscalls directly instead of executing userland
tools. Added sanity checks. Improved unit tests.
Upstream-commit: e035f3e92b07c7ce601ec2a7a71150e76b1eccfd
Component: engine
2013-01-22 12:12:16 -08:00
Andrea Luzzardi 0eec792d3d Merge branch 'master' of github.com:dotcloud/docker
Upstream-commit: 005db1982d4e7548ef4fc4521f342b2e3f2701df
Component: engine
2013-01-22 11:13:38 -08:00
Andrea Luzzardi 12fb0ecd0d Container: Better serialization/reloading support
Upstream-commit: 8e9bb02ce530839dcd35db0c21ff219360485a34
Component: engine
2013-01-22 11:13:22 -08:00
Solomon Hykes ba39fc1df2 'docker snapshot': create a new layer from a container. 'docker tar': stream the contents of a container or layer as a tar archive
Upstream-commit: 3b69ff64411fabcbe07639821e45cab70866b1ad
Component: engine
2013-01-22 09:54:56 -08:00
Andrea Luzzardi d915837cc1 container.Name -> container.Id
Upstream-commit: 78c02daf474d798eea2da94286b30171d8deb98f
Component: engine
2013-01-21 18:39:52 -08:00
Solomon Hykes 3270a17017 'docker logs': print full logs of a container
Upstream-commit: aa31e7764dd6db063df281930248b641a83894d0
Component: engine
2013-01-21 18:31:12 -08:00
Solomon Hykes dbcbe21e42 Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: 72c0a091c0c1bd377ad11f547e0652a953d32184
Component: engine
2013-01-21 18:15:19 -08:00
Solomon Hykes 05cbf7f98a 'docker rm': remove layers. Layers currently in use can't removed.
Upstream-commit: 559e3200fa716b35ac87b401c982a0ec00b78fbc
Component: engine
2013-01-21 18:12:56 -08:00
Andrea Luzzardi 7876504025 Removed bogus .swp file
Upstream-commit: 13cd4650fdc636862bee73e6de5374205f3e6dd1
Component: engine
2013-01-21 18:06:31 -08:00
Andrea Luzzardi 031dbdddeb Docker: Clean shutdown of containers.
Stop() will send a SIGTERM to the init process of the container and give it 10 seconds to shutdown properly.
After the timeout is reached, the process will be force killed (SIGKILL).
Also available is Kill() which kills the process on the spot.
Upstream-commit: 24dac22892cc3c8f34e90222f64b87d750b5025e
Component: engine
2013-01-21 18:03:23 -08:00
Solomon Hykes 28140e7cb7 Fix the height of the terminal window in the web UI
Upstream-commit: be3563cebb953b75d301b63988589987e4f9e6d9
Component: engine
2013-01-20 22:23:11 -08:00
Solomon Hykes bfc265f408 docker run -a: optionally attach to the new process. Run it in the background by default
Upstream-commit: e74d0b2a569496ef47075ea80c0ca61501dc8da2
Component: engine
2013-01-20 22:22:51 -08:00