toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,224 Commits 3 Branches 295 Tags
d71035c5b7420916748c56c0d7a50bcbfb08fecf
Commit Graph

433 Commits

Author SHA1 Message Date
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
Guillaume J. Charmes 0c36be10c2 Merge pull request #3566 from tianon/fix-volume-symlinks 
Fix symlink mounting issues
Upstream-commit: e56562c35e0ef39a02c171f60fccd6588edb8846
Component: engine
 2014-01-21 11:37:05 -08:00
Alexander Larsson 36def61b75 Remove container.EnsureMounted 
This was deprecated already and all it did was call Mount().
The use of this was a bit confusing since we need to pair Mount/Unmount
calls which wasn't obvious with "EnsureMounted".

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 191aa17d16c0935a7deda03b4c3bc879f7a316eb
Component: engine
 2014-01-21 11:26:11 +01:00
Alexander Larsson 5e35604785 Add Put() to graphdriver API and use it 
This makes all users of Put() have a corresponding call
to Get() which means we will be able to track whether
any particular ID is in use and if not unmount it.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: bcaf6c2359d83acd5da54f499e21f4a148f491c5
Component: engine
 2014-01-21 11:25:37 +01:00
Guillaume J. Charmes 5b95959a09 Rename Process to Command 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 12468f2bc8a72a6bedfd681084863ea95b48713b
Component: engine
 2014-01-20 16:05:07 -08:00
Paul Nasrat 5de2521000 Don't expose cgroups via the execdriver API. 
Use Resources to represent container limits rather than a cgroup specific field.

Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com> (github: pnasrat)
Upstream-commit: 71c1646ba33da9b2567ad7a2f4cda0433c9718dd
Component: engine
 2014-01-20 17:06:24 -05:00
Alexander Larsson e8d9d10625 archive: Remove unused features 
This simplifies that code that calls out to tar by removing support
for now unused features.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 4fb1db7f742fb34a7a06621d0698063de87a572c
Component: engine
 2014-01-20 20:26:20 +01:00
Paul Nasrat c8d1294225 Extract cgroups pkg. 
Initial move before enhancing cgroups package.

Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com> (github: pnasrat)
Upstream-commit: 2553029959929184696e25ebdba4631ba7aeb8a6
Component: engine
 2014-01-20 14:15:44 -05:00
Paul Nasrat 20e6d0be01 Extract mount into pkg. 
Mount is self contained and generic, it should be in pkg, to allow other pkg modules to use it.

Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com> (github: pnasrat)
Upstream-commit: 2e094db6390dde57263c07665290b1477bb6df7e
Component: engine
 2014-01-20 13:59:29 -05:00
Tianon Gravi 70ed03954d Fix symlink mounting issues by evaluating symlinks directly on the LHS of a bind-mount -v and by FollowSymlinkInScope on the RHS just before mounting 
Tested successfully with variations around mounting /var/run and /var/run/docker.sock inside a "debian" container directly at /var/run/docker.sock where /var/run is a symlink to "/run" on both the host and in the container.

Fixes #3262

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 7379a22a8d1687fc004a129ec86fd6eb01c39ede
Component: engine
 2014-01-20 00:38:54 -07:00
Michael Crosby 8771a3eaee Move lxc template into lxc driver 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 70a5cb95b31c7596886b7f94d292444654b9af8d
Component: engine
 2014-01-17 17:42:58 -08:00
Guillaume J. Charmes 72a4c2e064 Rename Capabilities in sysinfo and move it to its own subpackage 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)

Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: crosbymichael)
Upstream-commit: 9e9f4b925b4b6a58a03bbff09150f1314d5fe3b2
Component: engine
 2014-01-17 17:42:58 -08:00
Guillaume J. Charmes ae872300fb Cleanup + add Info to driver in order to have specific IsRunning() 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)

Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: crosbymichael)
Upstream-commit: 889b4b10ae3ec1d6e7879c30860aafd7674cb576
Component: engine
 2014-01-17 17:42:22 -08:00
Michael Crosby ecb354d61e Improve wait for lxc and driver interface 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8c9f62d037a1bc82742ea316adaaf658af56b7c3
Component: engine
 2014-01-17 17:42:22 -08:00
Michael Crosby 61d0d163e4 Use utils.Go to get error from monitor 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: c2b602b2ac7b5b3a67dbb7945e97a9f48b1a625e
Component: engine
 2014-01-17 17:42:22 -08:00
Michael Crosby 016a7317fc Simplify chroot wait, address code review issues 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f3f2456b0451d93a539eac63dac93a748e01317f
Component: engine
 2014-01-17 17:42:22 -08:00
Michael Crosby 1e6d4ad1dd Move setup pty and standard pipes to funcs 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8a38ead21993dd500280ae427895363a2de8be8a
Component: engine
 2014-01-17 17:42:22 -08:00
Michael Crosby b7aec1007b Remove SysinitPath from process 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 1e81387edcab600c9b8bc2a502988f7b3a2013e7
Component: engine
 2014-01-17 17:42:22 -08:00
Michael Crosby 28c45914a4 Make exec driver run a blocking command 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f846ecdc77bb9ab4d44b41a2e403bcf579d6b6e9
Component: engine
 2014-01-17 17:42:22 -08:00
Michael Crosby 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
Michael Crosby 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
Michael Crosby 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
Michael Crosby 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