Commit Graph

66 Commits

Author SHA1 Message Date
01e4adc046 go fmt
Upstream-commit: 51c11868b0374d2551023ed38a2e929e2ae2717a
Component: engine
2013-02-13 17:40:57 -08:00
cc26343144 Restored dockerd from merge
Upstream-commit: 24ee1524815140b2299a1d98d4690d903a4abeb7
Component: engine
2013-02-13 17:40:10 -08:00
eacfe8775a merge
Upstream-commit: cb6014d6fdfc0770523ea05ee257f00c3758874a
Component: engine
2013-02-13 17:26:25 -08:00
aaedaa2b20 Implemented support to run as a different user (through the -u flag)
Upstream-commit: 6de3e8a22dfa736f88c0477392474d73f7bed3c5
Component: engine
2013-02-13 17:24:35 -08:00
e924ec5591 Moved server and client logic into sub-packages docker/server and docker/client, respectively. The UI is not affected.
Upstream-commit: e1b25e9b084a2375640b811a27b75b89d57666d9
Component: engine
2013-02-13 17:10:00 -08:00
3f005f3a30 merge
Upstream-commit: ec21a2d364573fd65086e607d23178e7d6091a9b
Component: engine
2013-02-13 14:19:35 -08:00
22a81ca759 Implemented a self-injecting process wrapper that runs inside the container
- Before starting the container, docker injects itself inside the container by mount binding the dockerd binary into /sbin/init
- Instead of running the user process directly inside the container, we run /sbin/init targetprocess [args...]
- When docker is run as /sbin/init (e.g. argv[0] == "/sbin/init"), then its own sys init code kicks in
- The sys init code will be responsible for setting up the process environment prior to its execution (setuid, networking, ...).
- Finally, docker's sys init will exec() the container's process, thus replacing itself with the target binary (which will be running as pid 1)
Upstream-commit: 58a22942602f9035a1ed44c65ae2c501420600a3
Component: engine
2013-02-13 14:01:44 -08:00
bef500257a go fmt
Upstream-commit: 0d4600626919ec072289c003051f6323db3ffb5f
Component: engine
2013-02-13 14:00:36 -08:00
8bfbfa7310 'docker pull' will download images from a public mirror by default
Upstream-commit: 3cfac8f335df1902ecdc58d78041ec632b8701fb
Component: engine
2013-02-12 22:24:55 -08:00
026bf169c9 Upload or download gzipped and bzipped images with put/pull -j/-b
Upstream-commit: 059837c92a6692feb5a6aad879e01e6380f82dca
Component: engine
2013-02-12 22:23:14 -08:00
e6faaa4b36 Clean up list of available commands
Upstream-commit: f20deac47f35520ace5ad1c1aadbd3f8c34ad571
Component: engine
2013-02-12 17:25:41 -08:00
2f7804f789 Make the web UI only accessible on localhost (recommended access is through ssh tunnel)
Upstream-commit: a6b7254a4e362fc6cc28088ba03f3d6cf497b9d5
Component: engine
2013-02-12 09:12:27 -08:00
2d49a43787 Disabled remote access to dockerd. Preferred usage is over ssh.
Upstream-commit: f330c2a2488b6c26973f0b0fb8da5115588b7f72
Component: engine
2013-02-12 08:37:12 -08:00
2383f838a0 'docker kill': kill a running container without losing its filesystem and log state
Upstream-commit: bded592a15403e92feb06dcbbed41eb385cabb84
Component: engine
2013-02-11 11:39:28 -08:00
5a3a4033e0 Cosmetic: renamed the variable for sub-command argument parsing, to avoid confusion between 'flag' and 'flags'
Upstream-commit: 5926cfd0ec244f4d5013326ecfa2b9958ca9db88
Component: engine
2013-02-11 11:17:25 -08:00
62200d164a "docker info": display system-wide information.
Upstream-commit: a608f5e3b8455f21dee94a1e358daed420b5e3b7
Component: engine
2013-02-04 23:37:25 -08:00
d5ca862c98 docker rmi: remove an image
Upstream-commit: de1c361a6eea95c867c43619fc1e7a7b8a147750
Component: engine
2013-02-01 00:08:45 -08:00
72e57e46d1 Fixed a bug with 'docker run'
Upstream-commit: bba4e368077cbc73db2a12c259c5fc2330dffe75
Component: engine
2013-01-29 16:51:03 -08:00
2549d8dd89 'docker run' with no argument runs a shell in the base image
Upstream-commit: 29410f43a0e576f3c7fe27456af2888cb8f9bc5f
Component: engine
2013-01-29 15:51:04 -08:00
572ecf3354 Fix web UI to work on remote URLs
Upstream-commit: 35f5cc239bea6931cf92459236a827762e040023
Component: engine
2013-01-29 15:30:32 -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
d92664f491 'docker inspect' can be used on images and containers
Upstream-commit: 1b898574cf8d814c453755d83065b22c211f6a29
Component: engine
2013-01-28 23:22:45 -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
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
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
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
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
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
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
5ddc825ec6 Moved more utilities to docker/future
Upstream-commit: 401dd3d8e02f720e5e3b2a0f337a57af41fa29c4
Component: engine
2013-01-25 11:23:18 -08:00
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
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
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
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
3270a17017 'docker logs': print full logs of a container
Upstream-commit: aa31e7764dd6db063df281930248b641a83894d0
Component: engine
2013-01-21 18:31:12 -08:00
dbcbe21e42 Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: 72c0a091c0c1bd377ad11f547e0652a953d32184
Component: engine
2013-01-21 18:15:19 -08:00
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
7876504025 Removed bogus .swp file
Upstream-commit: 13cd4650fdc636862bee73e6de5374205f3e6dd1
Component: engine
2013-01-21 18:06:31 -08:00
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
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
ca769d4cf3 docker web -u: display the URL of the web UI
Upstream-commit: 63081c6cc865a90cc13354c4d95c877c1c0489f2
Component: engine
2013-01-20 22:21:59 -08:00
d52fd1dde4 'docker diff': inspect changes to a container's filesystem
Upstream-commit: bdb66012a830e06103d0ed6913c38bbc69a09bca
Component: engine
2013-01-20 22:21:26 -08:00