p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,744 Commits 2 Branches 295 Tags
e2cc165aaf54a0e9b10ec00f59dc53bd8f4f32cc
Commit Graph

455 Commits

Author SHA1 Message Date
Guillaume J. Charmes
3a9e0a7416 Fix Race when killing the daemon 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: b845ff355a3342ee3fee99196d22194706763182
Component: engine
 2014-03-07 11:51:28 -08:00
Michael Crosby
936f96cce5 Remove the ghosts and kill everything 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 772ef99d2816b629d084e11fe7fba5953687b620
Component: engine
 2014-03-06 15:30:26 -08:00
Guillaume J. Charmes
dc4d93c655 Merge pull request #4327 from crosbymichael/add-libcontainer 
Add native execution driver to docker and make it the default
Upstream-commit: 69c69059fc3933531e19c05a9d2e831fb713881c
Component: engine
 2014-03-03 16:34:20 -08:00
Michael Crosby
e8666de768 Don't always just append env vars, replace defaults with ones from config 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: b02b933c6292c539833c15c15299628ac3360572
Component: engine
 2014-03-01 03:46:45 -08:00
Guillaume J. Charmes
319e82a27b Check if the command exists before dereference 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 5ec68197056fbb63abba847b61bf447fed955359
Component: engine
 2014-02-28 15:39:24 -08:00
Michael Crosby
bec84fb562 Merge branch 'master' into add-libcontainer 
Conflicts:
	execdriver/termconsole.go

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: ce08083f9cd23e8f5e44228b0b73884bcf2f3562
Component: engine
 2014-02-26 12:55:24 -08:00
Guillaume J. Charmes
01fcc83d7e Fix exit code issue with TTY mode 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 3806ff61d1580ca22b3b72257789285aa9bd9486
Component: engine
 2014-02-25 16:50:33 -08:00
Michael Crosby
4f321caf5c Merge branch 'master' into add-libcontainer 
Conflicts:
	runtime.go

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 27a43692c2b114ed9b6418e75d16cbb2e6c7a993
Component: engine
 2014-02-24 20:35:12 -08:00
Tianon Gravi
3e5bd59386 Extract our default PATH value to a constant for great reuse 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: b3ffc1f8358a9aa89448b37ea630c5783f0672d8
Component: engine
 2014-02-22 20:01:45 -07:00
Michael Crosby
4fbf234237 Initial commit of libcontainer running docker 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 2419e63d243255ef38f16799ffdc64084aa18fe4
Component: engine
 2014-02-21 17:23:49 -08:00
Michael Crosby
28cc135001 Move current tty and pipe impl to lxc driver 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: aac702727ea02b3974a2848748b0713ac583fc84
Component: engine
 2014-02-21 13:27:34 -08:00
Michael Crosby
a3562ba47c Add CloseWriters back and do an interface cast 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8e2284aaa2364a8e47a8058e65d60813f9cd5089
Component: engine
 2014-02-21 12:52:18 -08:00
Michael Crosby
b0992a0e99 Move term creation into driver 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 592c2f6f9a472bda227a03c819f73b8edc7c3320
Component: engine
 2014-02-21 12:42:37 -08:00
Michael Crosby
a808fdbf65 Change Console to Terminal 
Move creation and attach to driver
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 1e742876988546efb876f67f83de6737ee5e9cf6
Component: engine
 2014-02-21 12:32:14 -08:00
Michael Crosby
9de10592bc Move console into execdriver 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8c783c1c1336d8f2d1b08b9cbd8e2298d066750c
Component: engine
 2014-02-21 11:47:53 -08:00
Guillaume J. Charmes
587e65afdf Merge pull request #4159 from crosbymichael/move-volumes 
Move volumes out of container.go and into volumes.go
Upstream-commit: a3bc3bb8c338f3fb40202681dd8bd933851a651b
Component: engine
 2014-02-17 16:43:20 -08:00
Guillaume J. Charmes
bd991a8a29 Merge pull request #4162 from crosbymichael/movelinks 
Move links functionality into pkg
Upstream-commit: e9db157bee3719e9c23779446dd23f84a870c92b
Component: engine
 2014-02-17 16:34:47 -08:00
Alexander Larsson
de5db25585 Avoid temporarily unmounting the container when restarting it 
Stopping the container will typicall cause it to unmount, to keep it mounted
over the stop/start cycle we aquire a temporary reference to it during this time.

This helps with https://github.com/dotcloud/docker/issues/4036

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: ab0f3f86c8d05aa69415e6909a88b621d5b37e81
Component: engine
 2014-02-17 16:10:54 +01:00
Michael Crosby
a10cdc2a0c Move links to sub pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 147b09fae9527e760d74b5ef2f9558ee109f4009
Component: engine
 2014-02-14 18:18:16 -08:00
Michael Crosby
8a2b18fccd Remove container dependency for links 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: fc952e0de94aa4283c677ce6c153b1a766db2fc0
Component: engine
 2014-02-14 18:07:33 -08:00
Michael Crosby
39bda86fa5 Move volumes out of container.go and into volumes.go 
This helps clean up the container file and move volumes into
one location.  We currently cannot move volumes to a sub pkg
because they depend on Container and also modify fields on the
container.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: bd54d40f68f78093d6a252e96f8d17f7021af7b5
Component: engine
 2014-02-14 17:15:40 -08:00
Alexander Larsson
e12f62e6df Properly close archives 
All archive that are created from somewhere generally have to be closed, because
at some point there is a file or a pipe or something that backs them. So, we
make archive.Archive a ReadCloser. However, code consuming archives does not
typically close them so we add an archive.ArchiveReader and use that when we're
only reading.

We then change all the Tar/Archive places to create ReadClosers, and to properly
close them everywhere.

As an added bonus we can use ReadCloserWrapper rather than EofReader in several places,
which is good as EofReader doesn't always work right. For instance, many compression
schemes like gzip knows it is EOF before having read the EOF from the stream, so the
EofCloser never sees an EOF.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: f198ee525ad6862dce3940e08c72e0a092380a7b
Component: engine
 2014-02-14 13:46:17 +01:00
Guillaume J. Charmes
3dbd63bc33 Mount-bind the PTY as container console - allow for tmux/screen to run 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 408ea0771a9cb3046b8e484dcfefe5233fcbb27a
Component: engine
 2014-02-13 17:23:09 -08:00
unclejack
972ffb5ee2 Merge pull request #4073 from crosbymichael/fix-docker-cp-close 
Ensure docker cp stream is closed properly
Upstream-commit: c6edac9a1a33835e7ab0ea3173877f9731ec45a5
Component: engine
 2014-02-13 14:12:53 +02:00
Solomon Hykes
e378922981 Move the canonical run configuration objects to a sub-package 
* Config is now runconfig.Config
    * HostConfig is now runconfig.HostConfig
    * MergeConfig is now runconfig.Merge
    * CompareConfig is now runconfig.Compare
    * ParseRun is now runconfig.Parse
    * ContainerConfigFromJob is now runconfig.ContainerConfigFromJob
    * ContainerHostConfigFromJob is now runconfig.ContainerHostConfigFromJob

This facilitates refactoring commands.go and shrinks the core.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 6393c38339e11b4a099a460ecf46bb5cafc4283b
Component: engine
 2014-02-11 20:18:46 -08:00
Solomon Hykes
944b4ea1c7 New package nat: utilities for manipulating the text description of network ports. 
This facilitates the refactoring of commands.go

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 3ecd8ff0c80c593e1874cbfa0cc2abf946eeaf66
Component: engine
 2014-02-11 16:51:01 -08:00
Michael Crosby
a0e7d3fc71 Ensure docker cp stream is closes properly 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 35821ad78f4ad2b20cf839ecc5a73b44c568c5eb
Component: engine
 2014-02-11 06:21:53 -08:00
Solomon Hykes
eaeb410e5e New build instruction: ONBUILD defines a trigger to execute when extending an image with a new build 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 9f994c96468e2495a2dc118355b6565e7dac0f44
Component: engine
 2014-02-04 01:31:19 +00:00
Michael Crosby
8f61d5e8bf Fix unmounts out of container export funcs 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 02fdc194fc726ef2ce1fa4303e121abd277f8d32
Component: engine
 2014-02-03 16:14:16 -08:00
Michael Crosby
e1a338aef6 Fix port mapping unit tests 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 1d4de9ce1fe2c113cd7e9fcb6055b95c94c65b06
Component: engine
 2014-01-31 12:04:44 -08:00
Michael Crosby
b6b8e6cc38 Move network aspect of links into driver as a job 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 167403988dca37060edf37abbdd28360ee0d5d4a
Component: engine
 2014-01-31 12:04:44 -08:00
Michael Crosby
844634dcc8 Implement requesting the name ip 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 2df01661071e949faabf1fa9ba612c40710b686b
Component: engine
 2014-01-31 12:04:44 -08:00
Michael Crosby
052a914774 Fix integration tests 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 49b9813035b3abb445ef7238f034897fa03a9652
Component: engine
 2014-01-31 12:04:44 -08:00
Michael Crosby
2879fa9100 Fix sending []byte in job env 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 2d8709696c80e992a5b20ba7a00ca3268c57c11c
Component: engine
 2014-01-31 12:04:44 -08:00
Michael Crosby
0b250038dd Update core calls to network drivers 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: c712e74b45005e0f38297d254fb606aa18606d11
Component: engine
 2014-01-31 12:04:44 -08:00
Michael Crosby
3044e71de0 Merge pull request #3841 from alexlarsson/separate-base-fs 
Separate out graphdriver mount and container root
Upstream-commit: 53ee1daa699ab28fdd37d77b2cfbb0fc14dc0fdb
Component: engine
 2014-01-31 11:49:14 -08:00
Victor Vieux
deac379ef5 refactor all *FromJob functions 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 9261511aa509423432f4e22f6235719deadc0969
Component: engine
 2014-01-30 20:45:32 +00:00
Alexander Larsson
6d81dd5d9b Separate out graphdriver mount and container root 
This separates out the directory as returned from the graphdriver (the
"base" fs) from the root filesystem of the live container. This is
necessary as the "diff" operation needs access to the base filesystem
without all the mounts that the running container needs (/.dockerinit,
volumes, etc).

We change container in the following way:

Container.RootfsPath() returns the the directory which will be used as
the root in a running container. It is always of the form
"/var/lib/docker/container/<id>/root" and is a private bind mount to
the base filesystem. It is only available while the container is running.

Container.BasefsPath() returns the raw directory from the graph driver
without the container runtime mounts. It is availible whenever the
container is mounted (in between a container.Mount()/Unmount() pair,
which are properly refcounted).

This fixes issue #3840

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: fab19d197c6cc362182f6cee4d0a6e65e799875f
Component: engine
 2014-01-30 16:43:53 +01:00
Victor Vieux
c7071fbcda fix convertion issues 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 187646127fa80a5ba39a53619b410eb2a13f0ffd
Component: engine
 2014-01-30 00:56:42 +00:00
Peter Waller
b28de2eada Fix for issue #3786 
This is a fix for the case that one mount is inside another mount and
docker can't then delete the resulting container.

Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net> (github: pwaller)
Upstream-commit: 32753c3d241c9238b2a34f61fd44399453d7b455
Component: engine
 2014-01-27 17:31:25 +00:00
Victor Vieux
b7a9dba025 Move containers to a job 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 5ea2986ce5cfce1b86fdc92610dbc6d670691168
Component: engine
 2014-01-24 16:07:42 -08:00
Victor Vieux
a56db00ab7 Merge pull request #3747 from crosbymichael/move-networking 
Move IP Allocator into sub package and out of the core
Upstream-commit: 641005777aa1b27ec0eb778fa810ed8aa53bae3b
Component: engine
 2014-01-23 16:43:21 -08:00
Victor Vieux
225e97e755 Merge pull request #3724 from creack/extract-lxc-phase-2 
Refactor process to command
Upstream-commit: 0dd856ee7f636c82e9420ebbd9e2d0b3aeea5136
Component: engine
 2014-01-23 15:28:45 -08:00
Paul Morie
f0687486f0 Fix typo in container.go 
Docker-DCO-1.1-Signed-off-by: Paul Morie <pmorie@gmail.com> (github: pmorie)
Upstream-commit: 2f57eb04102c2ef08e478d3977fc3682672473af
Component: engine
 2014-01-23 18:10:33 -05:00
Michael Crosby
f755b9590d Move tests from core into ipallocator 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: fccca3542b91513dd0da73db21ffa3ced4dd9b7f
Component: engine
 2014-01-23 01:31:38 -08:00
Michael Crosby
96dad4beb8 Populate command in ghost state to pass to RestoreCommand 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8723a8a89ec7d5b2a37e0536d7aadd78e5329773
Component: engine
 2014-01-22 14:05:01 -08:00
Guillaume J. Charmes
3467e8dad5 Populate Command self cointainer (toward Restore()) 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 75e0357d691499b20dc903b702bc44c444f85005
Component: engine
 2014-01-22 14:04:55 -08:00
Guillaume J. Charmes
47913f96e1 Merge pull request #3073 from alexlarsson/refcount-driver-mounts 
Refcount driver mounts
Upstream-commit: f61a91f50a753e0b8878675b4bab8ee4dc2a70e1
Component: engine
 2014-01-22 11:42:17 -08:00
Michael Crosby
78636fd4dc Merge pull request #3682 from alexlarsson/implement-tar 
Implement tar in Go
Upstream-commit: 639d2ecd4f7a86a34bdde890002129f0b22c85fa
Component: engine
 2014-01-22 11:23:47 -08:00
Michael Crosby
003b985961 Fix die command when monitor returns 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 80f128a6ea2b71e2ed6838c6a913086859ed50ff
Component: engine
 2014-01-21 16:18:57 -08:00