Commit Graph

96 Commits

Author SHA1 Message Date
2afd5c1951 Container: Improved pseudo-terminal support
Upstream-commit: caea45dd72835926a615ecb36a256172c19f2a36
Component: engine
2013-01-29 15:51:21 -08:00
9b61c28d6f Created tests for stdin pipes and tty handling
Upstream-commit: ca40989e456cf81f26215059530b328d3be8c71c
Component: engine
2013-01-29 15:16:45 -08:00
3297bbd8b6 go fmt
Upstream-commit: 94b1cf4be3606ff731b3ca012e5eddf021f4608f
Component: engine
2013-01-29 13:50:27 -08:00
f9700d8d8c Fix bug introduced in c7a944caf28d85bd26f4031465e958006a764ac2 which caused 'docker images' to crash
Upstream-commit: f8f9285ccaeb35a2d5909a03f48f9d3b9d34aca2
Component: engine
2013-01-29 12:15:39 -08:00
47885a98e3 Generate shorter container IDs for readability
Upstream-commit: dfd15fbee87cc954d85884b1ce99ffacf7721a74
Component: engine
2013-01-29 03:25:00 -08:00
8805019aeb List containers ordered by creation time
Upstream-commit: c7a944caf28d85bd26f4031465e958006a764ac2
Component: engine
2013-01-29 03:24:31 -08:00
9b7c269240 docker run -c COMMENT
Upstream-commit: 4f3362b85a856f7ec5de0559f10386a8615cad60
Component: engine
2013-01-29 03:21:23 -08:00
747cbf0250 'docker ps' prints shorter lines
Upstream-commit: bcfe2aa2a7834eb49790f400192422350ba32cdb
Component: engine
2013-01-29 03:18:07 -08:00
d77271f58a Fixed bug which caused permission errors for non-root users on rw layer (Thanks @jpetazo!)
Upstream-commit: 279917e353fa888e5afd0904df80a225d462f30d
Component: engine
2013-01-29 03:14:16 -08:00
a44e018a27 Temporary licence file until we open-source it
Upstream-commit: d93070b2077dc805eee6c26340a371f4999447de
Component: engine
2013-01-28 23:34:17 -08:00
d92664f491 'docker inspect' can be used on images and containers
Upstream-commit: 1b898574cf8d814c453755d83065b22c211f6a29
Component: engine
2013-01-28 23:22:45 -08:00
b6d8688923 Fixed a bug which caused 'docker cp' to fail when the destination name already exists.
Upstream-commit: 49da84d7c4babd597dfbcba168a81a4434c28bf1
Component: engine
2013-01-28 23:17:47 -08:00
5b2d2c5a81 Fixed docker.fake so that fake.StartCommand() can be used on Darwin for testing
Upstream-commit: d8a4910eee1f62dc8182c77d5caba9650494941d
Component: engine
2013-01-28 23:16:41 -08:00
98216a0181 Fixed bug which caused AUFS layers to be mounted in the wrong order.
Upstream-commit: 2dadcf9b81f27113564260e668d5b734d7a9c63c
Component: engine
2013-01-28 23:15:02 -08:00
64d5611a9c 'docker ps' lists running containers. 'docker ps -a' also includes stopped containers
Upstream-commit: 903f091adc3878f9e08874dd4b748ae10853cbd3
Component: engine
2013-01-28 23:13:58 -08:00
9f3880a4db Fixed typo in Darwin termios settings
Upstream-commit: c283ff667550d6e86a7bcc16259c796f4261be6e
Component: engine
2013-01-28 18:37:54 -08:00
870743bf59 'docker run -i' optionally opens stdin. 'docker attach' attaches to a running container (including stdin). 'docker run -t' allocates a tty (still buggy)
Upstream-commit: 7a50153c321ff96c16947b3bab9b8e385f2f2a5e
Component: engine
2013-01-28 17:50:12 -08:00
f1c2218a8a Merge branch 'master' of github.com:dotcloud/docker
Upstream-commit: 9906a9af8f2f66dfd630c219936e0a27b9754e56
Component: engine
2013-01-28 17:32:38 -08:00
3e5ac730a8 Networking: Mount bind (ro) the host's /etc/resolv.conf into the
container in order to get networking.
Upstream-commit: 54a946e333077f59c8e6eb0663ab3e138a9e8320
Component: engine
2013-01-28 17:32:15 -08:00
e0d4eb7361 Forgot an import in termios_darwin
Upstream-commit: c914aaf43e9eea2e67f42fc93667a40c36b6cd35
Component: engine
2013-01-28 17:07:38 -08:00
0922b8dd16 Different termios for linux/darwin
Upstream-commit: 08ac1d0b3543b9ab98b2cbeaea6bb9512d6a14b5
Component: engine
2013-01-28 17:06:46 -08:00
a499fea2e5 go fmt
Upstream-commit: 333abbf85a8db9578e34c340032e32de3c8fefe8
Component: engine
2013-01-28 14:30:05 -08:00
4deb0e4193 Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: 192446e796f8bace607c82c2f5c43ed5826bf3a9
Component: engine
2013-01-28 14:23:39 -08:00
2c16835563 Fixed broken unit test after merge
Upstream-commit: d802a31be538d7c90d3f33474595dfdb77b7e50e
Component: engine
2013-01-28 12:11:30 -08:00
6ec3df7414 merge conflicts
Upstream-commit: 2cb444248db185a7d332434d53605e289962af0c
Component: engine
2013-01-28 12:06:49 -08:00
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
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
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
7b5bb8d40c filesystem: Added IsMounted() unit tests
Upstream-commit: d8bc912238dfa75dff0902b9d97133e200807bea
Component: engine
2013-01-28 11:51:41 -08:00
8802c173bf Convenience logging in rcli
Upstream-commit: 54532e2ab709a25943a9d0b470ecf5c155deee5f
Component: engine
2013-01-27 15:43:08 -08:00
0dd4a9f417 Experimenting with a UI which differentiates images and containers
Upstream-commit: 904b0ab52b065025acbdba6fdc056ef1dff04d44
Component: engine
2013-01-27 15:42:42 -08:00
a61c8ab5e5 Added various debugging commands: cat, write, ls, inspect, mount, umount
Upstream-commit: 6df37208be269540a6f291448491bf5de9f46c96
Component: engine
2013-01-27 01:08:34 -08:00
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
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
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
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
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
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
001d53c5f0 Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: dbc7fb757541260b75ef5a77176b77bb3fd99944
Component: engine
2013-01-25 18:02:56 -08:00
488ccc535c Fixed a bug preventing containers from running after being restored
Upstream-commit: 6513a1d94ed25a5f99b1e3d1670781f7597f9d35
Component: engine
2013-01-25 16:20:34 -08:00
0fdf1beadc Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: fca26254908387b96ed824c16199875955123928
Component: engine
2013-01-25 15:42:43 -08:00
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
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
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
05f939e0c7 Merge branch 'master' of github.com:dotcloud/docker
Upstream-commit: 1df9819b257e2947c99c88973cc4cb7917b5ff62
Component: engine
2013-01-25 14:09:54 -08:00
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
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
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
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
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