Commit Graph

156 Commits

Author SHA1 Message Date
fc5496269e Merge pull request #6123 from vieux/no_number_default
no default default number in names
Upstream-commit: b46449cb33be12efa89b740be15ae98e686ed97a
Component: engine
2014-05-31 00:55:11 +03:00
930b30cb1b Merge pull request #6065 from vieux/fix_race_waitlock
update container's state after we close the waitLock
Upstream-commit: c90faa47b66e3254521ef33eb5b2c8b99d741625
Component: engine
2014-05-31 00:38:35 +03:00
13006a3fdc no default default number in names
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: e70a5ab0149562609d3a16105aada365ed940cb5
Component: engine
2014-05-30 19:08:21 +00:00
1c65521b44 optimize restore & use Getenv less in daemon.go
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 0fd0deb75d6e38973f154c5b41c7d4e22a9c4fef
Component: engine
2014-05-30 21:20:27 +03:00
f31e7878cf Goroutine-safe daemon.containers
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: af17b01ad7ba0c4d243e2e234710e44a14b6dad4
Component: engine
2014-05-30 16:08:06 +04:00
57a9b63e5e Fix race in native driver on activeContainers usage
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 64bd6a6a5342c87db7096f60365d270d0d69e9d2
Component: engine
2014-05-30 14:16:00 +04:00
bfa0c1d204 Fix races in set/get currentInterfaces in networkdriver
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 4e5f6951f2af836c3d9163c8a150298ee87468d4
Component: engine
2014-05-30 14:16:00 +04:00
7903608c88 block aufs on incompatible file systems
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: e8a87120d459dfeffee5474c3253e787d38b2ac0
Component: engine
2014-05-30 02:32:27 +03:00
32c2485efa Add ErrPrerequisites to improve misleading errors
There are two cases where we can't use a graphdriver:

1) the graphdriver itself isn't supported by the system
2) the graphdriver is supported by some configuration/prerequisites are
missing

This introduces a new error for the 2) case and uses it when trying to
run docker with btrfs backend on a non-btrfs filesystem.

Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org> (github: discordianfish)
Upstream-commit: 75754e69f6cce80c34ebc72817ada0a807fd635a
Component: engine
2014-05-29 17:09:55 +02:00
ea766a12d8 Merge pull request #5868 from jhspaybar/5749-libcontainerroutes
libcontainer support for arbitrary route table entries
Upstream-commit: 5e2af0713735d6724179540d4d1b0827ab8c4570
Component: engine
2014-05-28 10:50:56 -07:00
fc7b9b154d Fixes #5749
libcontainer support for arbitrary route table entries

Docker-DCO-1.1-Signed-off-by: William Thurston <me@williamthurston.com> (github: jhspaybar)
Upstream-commit: bf7f360dcac38037d5c4f9e2e90d01adc240ed2b
Component: engine
2014-05-28 17:42:02 +00:00
5ea7137278 Return devmapper errors with additional text
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 69640123826cf73d3d83182cb81e5de4ad0cc3a7
Component: engine
2014-05-27 19:03:57 -07:00
687a71e998 update container's state after we close the waitLock
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 1de52caedca11c083e92039e2ecd8671944dfc47
Component: engine
2014-05-28 00:18:51 +00:00
0ef8d97b63 Update lxc to use cmd.Wait()
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 5310e8575f5a251000bbecd6d998eb11cb95fe04
Component: engine
2014-05-27 13:52:05 -07:00
e0a89dbf86 Merge pull request #6059 from erikh/fix-tests
Fix race condition in CLI tests: diff was not acquiring a container lock
Upstream-commit: a60537992710edce4095b987f6e19ad0aea34ffa
Component: engine
2014-05-27 13:19:32 -07:00
37b20aec53 Merge pull request #6025 from crosbymichael/concurrent-names
Improve name generation on concurrent requests
Upstream-commit: 0d9a5ce6dd061089a3a485bf359a054d83b74059
Component: engine
2014-05-27 23:18:19 +03:00
3ed3d24076 Fix race condition in CLI tests: diff was not acquiring a container lock
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 8b77e0183eaa7b3a87921f9655e2799d300bf775
Component: engine
2014-05-27 12:28:31 -07:00
05b57dfef1 Add Wait() calls in the appropriate spots
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 92e41a02ce40c7d3446b8ca7ec5c5671ac3d8917
Component: engine
2014-05-27 12:26:56 -07:00
3feecdd11d Merge pull request #5937 from LK4D4/ipallocator_refactoring
Ip allocator refactoring
Upstream-commit: bdb5aa4c27b375cc8cd59fd6fa26ec10c23e58f9
Component: engine
2014-05-27 12:22:36 -07:00
3df190d391 Merge pull request #6000 from cyphar/5619-fix-unsafe-path-resolution
Properly handle paths with symlink path components
Upstream-commit: 754797bba7e9e18a94ed73c8f94fa91973e547c3
Component: engine
2014-05-27 12:06:19 -07:00
d8e73d4132 Ip allocator refactoring
We don't need ordered set anymore, also some cleanings and simple
benchmark.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: ef94ac7d2fd42a09c99567b0393fb48b9d782a9e
Component: engine
2014-05-27 22:56:26 +04:00
e52cd2deb7 daemon: container: properly handle paths with symlink path components
This patch fixes the incorrect handling of paths which contain a
symlink as a path component when copying data from a container.
Essentially, this patch changes the container.Copy() method to
first "resolve" the resource by resolving all of symlinks encountered
in the path relative to the container's rootfs (using pkg/symlink).

Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: 328d2cba116067a2ad0f161b9ee098ed024825b3
Component: engine
2014-05-24 11:01:19 +10:00
150de13c9e Improve name generation on concurrent requests
Fixes #2586

This fixes a few races where the name generator asks if a name is free
but another container takes the name before it can be reserved.  This
solves this by generating the name and setting it.  If the set fails
with a non unique error then we try again.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 6ec86cb6e517bfb5ded818244b9db9510a2ed0b9
Component: engine
2014-05-23 17:51:16 -07:00
d454476d00 We need to umount /var/lib/docker when the daemon exits.
Currently we are leaving it bind mounted on stop.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: a3ff8a98f770ae35103e3ce3c4221c00b4efcb7f
Component: engine
2014-05-23 11:43:46 -04:00
e0f1623f01 add recursive device nodes
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 0abb52c7a97940dc17c45ac45226af8156d0e712
Component: engine
2014-05-22 22:29:13 +00:00
3bbd8860d6 devmapper: Don't enable discard during mkfs.ext4
There is no reason to do discard durink mkfs, as the filesystem
is on a newly allocated device anyway. Discard is a slow operation,
so this may help initial startup a bit, especially if you use a larger
thin pool.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 42708181b1976a768428568e664c566717ade8c4
Component: engine
2014-05-22 09:23:52 +02:00
f41d7794be Merge pull request #5976 from crosbymichael/getpids
Move get pid into cgroup implementation
Upstream-commit: 55d41c3e21e1593b944c06196ffb2ac57ab7f653
Component: engine
2014-05-21 19:09:50 -07:00
69fad1b67f Merge pull request #5922 from crosbymichael/host-dev-priv
Mount /dev in tmpfs for privileged containers
Upstream-commit: 5a0a03e3942651a07858c278c4b40a0ead50eccb
Component: engine
2014-05-21 18:56:24 -07:00
d979c2acea Merge pull request #5859 from philips/append-etc-hosts-not-bind
fix(daemon): prepend host /etc/hosts instead of bind mounting
Upstream-commit: 4bb4bf634a0a056ff8fb4186875c004e156f012d
Component: engine
2014-05-21 15:57:59 -07:00
189f43a3ba Move get pid into cgroup implementation
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 811d93326bc2d9451eb444e2343bb3063611de7a
Component: engine
2014-05-21 21:14:07 +00:00
d951df01e3 Merge pull request #5958 from erikh/5738-docker_port_in_use
docker port in use
Upstream-commit: b7f9e683c3edd5c48062d00cfe3ea279e8037106
Component: engine
2014-05-21 21:06:27 +00:00
d6d188680f Merge pull request #5975 from tianon/revert-run-tmpfs
Revert "Always mount a /run tmpfs in the container"
Upstream-commit: 457cb86cf2bb40fdce3e6b6a49d5eaec454a617b
Component: engine
2014-05-21 13:46:48 -07:00
d2e4e6b069 Revert "Always mount a /run tmpfs in the container"
This reverts commit 905795ece624675abe2ec2622b0bbafdb9d7f44c.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 8e967fe8028d8362fe3dfb293a8e07a959a4dd7f
Component: engine
2014-05-21 14:28:19 -06:00
1e8e32fb77 bridge: retry any proxy set up failures until we get a successful port, defeats a race condition
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 91ba3379312a74132e2578d167c9e36eeb889525
Component: engine
2014-05-21 09:14:53 -07:00
ff6d32db91 portallocator: rewrite to simplify, removes race condition
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: f0489ce3a9a4023265bbbd5e9cb333e95f950088
Component: engine
2014-05-21 09:14:53 -07:00
3921a34ddb use buffered channel so goroutine does not get blocked on done <- true when a timeout occurs.
Docker-DCO-1.1-Signed-off-by: Anandkumar Patel <anandkumarpatel@gmail.com> (github: anandkumarpatel)
Upstream-commit: 789a8f26161ca86a721fe6b7295e3eaf9051b3a2
Component: engine
2014-05-20 21:33:40 -07:00
37f08c7066 Update code post codereview
Add specific types for Required and Optional DeviceNodes
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f042c3c15759fce5cc139f2b3362b791ac7d4829
Component: engine
2014-05-21 00:40:41 +00:00
ada6c057b6 Mount /dev in tmpfs for privileged containers
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 34c05c58c8d41ee2bb02cd8059e9928ee2f061ea
Component: engine
2014-05-20 22:51:24 +00:00
b9dbdb7d9e Merge pull request #5755 from vieux/move_inspect_daemon
move inspect from server to daemon
Upstream-commit: 83e9dc720039cfa8685b8dc59f76ca2f1e9489d2
Component: engine
2014-05-20 15:50:38 -07:00
c9d0eafbf0 Merge pull request #5946 from crosbymichael/lxc-host-net
Fix network mode for lxc 1.0
Upstream-commit: 1310243d488cfede2f5765e79b01ab20efd46cc0
Component: engine
2014-05-20 14:51:33 -07:00
61e4bbbc1b Merge pull request #5918 from crosbymichael/volumes-commit
Do not commit host bind mounts into image
Upstream-commit: 70d35b9d39239fa14bea0bc462ff71c17570c93d
Component: engine
2014-05-20 14:28:49 -07:00
74d86a8d61 move inspect from server to daemon
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 603e00a3a7644caf118d3efd0932500b4dfc4de3
Component: engine
2014-05-20 19:36:15 +00:00
417fd6d53a Fix network mode for lxc 1.0
Fixes #5692

This change requires lxc 1.0+ to work and breaks lxc versions less than
1.0 for host networking.  We think that this is a find tradeoff by
bumping docker to only support lxc 1.0
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 0f278940947d74f2b7889ada18808779312f9608
Component: engine
2014-05-20 19:10:23 +00:00
da7177cbfd native driver: Add required capabilities
We need SETFCAP to be able to mark files as having caps, which is
heavily used by fedora.
See https://github.com/dotcloud/docker/issues/5928

We also need SETPCAP, for instance systemd needs this to set caps
on its childen.

Both of these are safe in the sense that they can never ever
result in a process with a capability not in the bounding set of the
container.

We also add NET_BIND_SERVICE caps, to be able to bind to ports lower
than 1024.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: fcf2e9a9107c6c9aebaf63ce044f636333e7eed8
Component: engine
2014-05-20 11:31:39 +02:00
16c9a15cd6 fix(daemon): prepend host /etc/hosts instead of bind mounting
systemd systems do not require a /etc/hosts file exists since an nss
module is shipped that creates localhost implicitly. So, mounting
/etc/hosts can fail on these sorts of systems, as was reported on CoreOS
in issue #5812.

Instead of trying to bind mount just copy the hosts entries onto the
containers private /etc/hosts.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 000a37fe9d13a173ab46fcd5b8e693950a438f98
Component: engine
2014-05-19 22:32:51 -07:00
2c620b9486 Don't save bind mounts in image
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d535d9810012b18ca83f86aa416ff4a08bb49804
Component: engine
2014-05-19 22:18:37 +00:00
09f949815a Move init volumes code to func
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e454be7567e144dc836ff283d4f4e059db307a91
Component: engine
2014-05-19 22:04:51 +00:00
27fffbebb6 starts by removing the name from the graph db
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: c12dd770908acc06ab402840ad7736e0c056b567
Component: engine
2014-05-19 21:22:33 +00:00
15e0b23213 Merge pull request #5876 from timthelion/docs-daemon-readme
Add readme for daemon directory
Upstream-commit: 40c8fc668c5e8aa4d74d6fa3c7c27a22cd45438c
Component: engine
2014-05-19 10:51:17 -07:00
4feffb64a0 Don't drop CAP_FOWNER in the container. Also sorts the list of allowed
capabilities.

Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
Upstream-commit: 0abad3ae2290a2b051b8fdaceab17a1ee41ecfb9
Component: engine
2014-05-19 16:52:39 +00:00