Commit Graph

92 Commits

Author SHA1 Message Date
19c4006853 Remove accidental commit that enabled MountMethodFilesystem
Upstream-commit: 91c69fd3532eaa92cfc21c6331699a995fdbe2a6
Component: engine
2013-09-30 17:35:01 -06:00
9f8a6e47d8 Add trivial copy-based CoW backend
This creates a container by copying the corresponding files
from the layers into the containers. This is not gonna be very useful
on a developer setup, as there is no copy-on-write or general diskspace
sharing. It also makes container instantiation slower.

However, it may be useful in deployment where we don't always have a lot
of containers running (long-running daemons) and where we don't
do a lot of docker commits.
Upstream-commit: 43a7d3d0e9e2fafcdc90cb84855e1bb3869d2729
Component: engine
2013-09-30 17:35:01 -06:00
0453049ffb Runtime: Only remove device on destroy if it exists
Upstream-commit: 5f8e24f8428bc5fb7076ec757ded44f965c48888
Component: engine
2013-09-30 17:35:01 -06:00
70d3d13622 Allow specifying the docker client path in _DOCKER_INIT_PATH
I currently need this to get the tests running, otherwise it will
mount the docker.test binary inside the containers, which doesn't
work due to the libdevmapper.so dependency.
Upstream-commit: 76a2ab6e34e6cdd66899815aeeaac2048e5bafce
Component: engine
2013-09-30 17:35:00 -06:00
7d0232a89a Limit the amount of prints during normal runs
This removes some Debugf() calls and chages some direct prints to
Debugf(). This means we don't get a bunch of spew when running the
tests.
Upstream-commit: 6094257b28f2e4b5e1a6616c77961b5cec0c9195
Component: engine
2013-09-30 17:35:00 -06:00
348d75b3b5 Delete corresponding Devices when deleting Images
If an image is deleted and there is a corresponding device
for that image we also delete the image.
Upstream-commit: 99393cf3cfd08de769f0c37f06b912fb3771a080
Component: engine
2013-09-30 17:35:00 -06:00
fef827ba7b Runtime: Delete corresponding devices when deleting container
Upstream-commit: 30890c7763e775d38c82d3eac5c1650e149137ae
Component: engine
2013-09-30 17:35:00 -06:00
03b4e52ca7 Runtime: Add MountMethod to allow AUFS and device-mapper to coexist
Upstream-commit: 8f7361279c13660a617886a523c50ecbc6849129
Component: engine
2013-09-30 17:34:59 -06:00
4f27979b41 Runtime: Add DeviceSet singleton
This adds a DeviceSet singleton to the Runtime object which will be used for
any DeviceMapper dependent code.
Upstream-commit: ca2f7f955e697091f2b7bee9a33c6c4e106cecd0
Component: engine
2013-09-30 17:34:59 -06:00
b25a04bd5f Runtime: Automatically use docker-init if it exists
In some builds the main docker binary is not statically linked,
and as such not usable in as the .dockerinit binary, for those
cases we look for a separately shipped docker-init binary and
use that instead.
Upstream-commit: 167601e85850aa58df96f9d0796f9c26ed2d6fa4
Component: engine
2013-09-30 17:34:58 -06:00
5bcfc0bffe automatically remove container via -rm
add AutoRemove to HostConfig
add -rm flag to docker run
add TestRunAutoRemove to test -rm
docs: add -rm to commandline/command/run
add hostConfig to container monitor
make monitor destroy the container via -rm

This adds support for automatically removing a container after it
exits. The removal of the container is handled on the server side.
Upstream-commit: 22e7e107addc4703ee6ef36981dfafe985be695d
Component: engine
2013-09-27 17:43:12 +03:00
2d20e5611c rebase master
Upstream-commit: bd847f66c635380096b19c41c4a3536dff4199e1
Component: engine
2013-09-09 22:11:53 +00:00
f75afeebe3 Add missing package import
Upstream-commit: eca861a99d1a5abe91704b55d044eb8280adb8d1
Component: engine
2013-09-07 17:03:40 -07:00
7985dd19d1 Add missing comments to runtime.go
Upstream-commit: 6a9f4ecf9bc4263baef8e9a1d86f1474f9c66d31
Component: engine
2013-09-06 17:43:34 -07:00
aa0ad01db6 Merge builder.go into runtime.go
Upstream-commit: 24e02043a2672320abebc3bd5fa6a592e2ebd082
Component: engine
2013-09-06 17:33:05 -07:00
068b4e2c39 remove message during tests
Upstream-commit: f159f4710b0c5dac8b71246dddbaee667dd6a702
Component: engine
2013-08-29 22:59:34 +00:00
4faecb5fe5 Merge pull request #1563 from dotcloud/1073_add_loading_message
* Runtime: Add loading containers message in no debug
Upstream-commit: 8dd3607bd1fd41b4844e3415b832780a6c878e33
Component: engine
2013-08-23 11:20:22 -07:00
9fd5016532 assume ip_forwarding = 1 by default
Upstream-commit: b21f89862076397b63eb3ac4a19b9125b6f6477a
Component: engine
2013-08-19 12:34:30 +00:00
9657023315 add loading message
Upstream-commit: 20b1e19641d94b5e71ecee7a9703eb392a81cf9a
Component: engine
2013-08-16 13:43:09 +00:00
8ef6c1627f runtime: correctly detect IPv4 forwarding
When memory cgroup is absent, there was not attempt to detect if IPv4
forwarding was enabled and therefore, docker was printing a warning
for each command spawning a new container. The test for IPv4
forwarding was guarded by the test for memory cgroup.
Upstream-commit: 64b817a5c12545252d0cbb3d4ce1f23996bb266b
Component: engine
2013-08-11 11:52:16 +02:00
c746f1a64f Add warning when net.ipv4.ip_forwarding = 0
Added warnings to api.go, container.go, commands.go, and runtime.go
Also updated APIInfo to return whether IPv4Forwarding is enabled
Upstream-commit: 10190be5d74bc4b13a885f2ba27c2299c868fd19
Component: engine
2013-08-07 18:28:39 -04:00
cb4f99ad54 Merge branch 'master' into new_logs
Upstream-commit: 5756ba9bc48ef428bd73b9b123807097c1519db0
Component: engine
2013-07-15 13:57:54 +00:00
750c01d0af wip
Upstream-commit: 941e3e2ef09092306a7a287ce62b6fb518af9c56
Component: engine
2013-07-11 17:18:28 +00:00
d8be5aafec rebase master
Upstream-commit: bf7d6cbb4af2e7176c66d2ad74515699b7898fea
Component: engine
2013-07-08 13:26:29 +00:00
8f5746f4d9 Mutex style change.
For structs protected by a single mutex, embed the mutex for more
concise usage.

Also use a sync.Mutex directly, rather than a pointer, to avoid the
need for initialization (because a Mutex's zero-value is valid and
ready to be used).
Upstream-commit: 1cf9c80e976fb60b4d5d489cd1c4c9959bcc4f7f
Component: engine
2013-07-02 15:53:08 -07:00
805a9b9625 never remove the file and try to load it in start
Upstream-commit: 3042f11666a38ea6b1da206de372bf85463db945
Component: engine
2013-07-02 18:02:16 +00:00
be9588204f store hostConfig to /tmp while container is running
Upstream-commit: 06b53e3fc7aca2b3dae32edab08c7662d3e9e7e8
Component: engine
2013-07-02 12:19:25 +00:00
a223caa9e6 + Runtime: mount volumes from a host directory with 'docker run -b'
Upstream-commit: 4fdf11b2e62bf7d785a958afd4fc5b8cfc32f621
Component: engine
2013-06-26 15:07:31 -07:00
ffff9b2ac4 Add argument to allow setting base directory for docker daemon's storage to values other than "/var/lib/docker".
Upstream-commit: e44f62a95cc8f3cab446205d66450ee37911e29c
Component: engine
2013-06-20 16:29:54 -05:00
72a9843fea Add -dns to docker daemon
Upstream-commit: 84d68007cb36b68e1b5c574a0d23fcf583e0d75c
Component: engine
2013-06-05 14:20:54 -07:00
4747c5b99f linted names
Upstream-commit: fd224ee590dc9f003f6507b529a9f47cceb02c44
Component: engine
2013-06-04 18:00:22 +00:00
9c0086fb7d drop/omit
Upstream-commit: 86ada2fa5d00820288df8a59eca3deef83f4aeb6
Component: engine
2013-06-04 13:51:12 +00:00
c376c6e645 Move getKernelVersion to utils package
Upstream-commit: f3bab52df4c6b54218ed36ac354ffc3573d31f3b
Component: engine
2013-05-15 17:40:47 -07:00
2d208e56c7 Move authConfig from runtime to registry
Upstream-commit: 95dd6d31a4c11618836f9a55fc3dbbde48450b09
Component: engine
2013-05-15 17:17:33 -07:00
bc6fad489c Create a subpackage for utils
Upstream-commit: 2e69e1727b4d5698a90c24c5800eecd5401dc319
Component: engine
2013-05-14 22:37:35 +00:00
b1cb259eb1 Reduce the Destroy timeout from 10 to 3 seconds
Upstream-commit: 28fd289b448164b77affd8103c0d96fd8110daf9
Component: engine
2013-05-09 21:53:59 -07:00
664f8fbbbd Check the command existance prior create and add Unit tests for the case
Upstream-commit: 42b1ea4889cd61790f81001ada5deac9354be378
Component: engine
2013-05-07 11:18:13 -07:00
ba650a016c Rebase master (autorun)
Upstream-commit: 6c168a8986261c95ae5e036f008375f77afbe78e
Component: engine
2013-05-06 16:01:00 -07:00
0c47ce6243 Move runtime.Commit to builder.Commit
Upstream-commit: f7c5e92a2e1ec30f50b0affe952a0496c62195f5
Component: engine
2013-05-06 16:00:30 -07:00
830fa88486 Moving runtime.Create to builder.Create
Upstream-commit: 6f2125386a07a01eccce3bb4602aeecb8be3458b
Component: engine
2013-05-06 16:00:30 -07:00
f2c645d68e Fix the command existance check
Upstream-commit: b9ec03c21b8fdbc54fdd7a3cb86f3c555e91f989
Component: engine
2013-05-02 20:50:28 -07:00
e6dd1bf4aa Fix server crash when running an image without command without autorun
Upstream-commit: 64d7bc442daa012683b38183c71674b9ecd660c2
Component: engine
2013-05-02 13:56:45 -07:00
1e4304b721 Fix issue within mergeConfig preventing hostname and user to be set
Upstream-commit: 83784989514ca010bf6c292b01482e0baa14ff85
Component: engine
2013-05-02 12:32:10 -07:00
be84d975bd docker run -v PATH: bind a new data volume to a container
Upstream-commit: 1df5f4094bf31edba6f2a2f07bfdada54340c1e4
Component: engine
2013-05-02 09:14:22 -07:00
c9f8d85006 Merge pull request #482 from dotcloud/move_capabilitie_function
* runtime: Move the capabilities detection into a runtime method
Upstream-commit: e431dc26f115cee290b9bfcdf73a1ea4eebecfce
Component: engine
2013-05-01 17:43:32 -07:00
0f53d29623 + Commit default runtime options with a layer
Upstream-commit: f7aaa06606e0acf36d2979533f40e51ae7ef29c0
Component: engine
2013-05-01 11:33:21 -07:00
b7c2a5f9a1 Actually use the mergeConfig function
Upstream-commit: 7ff65d40d557e0a128534c096f3cab0c10a79f7b
Component: engine
2013-05-01 11:22:06 -07:00
91fa0f0669 Move the capabilities detection into a runtime method
Upstream-commit: 9042535f5af607f2362fa3f995427e1c5aab664e
Component: engine
2013-04-26 14:32:55 -07:00
45f51cdc1d Implement -config and -command in CmdCommit in order to allow autorun
Upstream-commit: 51d6228261cdc379aade581ee504b2c59a3e02a9
Component: engine
2013-04-25 16:48:31 -07:00
85eee11a06 Add -r flag to dockerd in order to restart previously running container. Fixes #26
Upstream-commit: 50144aeb42283848db730b936d6b5b6332ec6565
Component: engine
2013-04-24 19:01:23 -07:00