Commit Graph

41 Commits

Author SHA1 Message Date
da42bdb7df Merge pull request #4628 from kippandrew/port-allocator
Fix port collision with dynamically allocated ports
Upstream-commit: abef5cb0fcd107c751b7390bc7eb45e3ecd675e6
Component: engine
2014-03-25 14:30:10 -07:00
e9aaf94539 Merge pull request #4794 from alexlarsson/dm-better-shutdown
devicemapper: Better/faster shutdown
Upstream-commit: 6643cc20fe16f36ffb3342bec61a3c0f24d2a9df
Component: engine
2014-03-25 14:03:00 -07:00
aa948163e7 Revert "Disable automatic killing of containers when docker stop fails"
This reverts commit 8b5cf51d600dc4f3611cf063c52cf3448e7b01e5.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d503714285143013d9fa6932ee5775fd155d26d2
Component: engine
2014-03-24 12:03:56 +00:00
08c755a87a Merge pull request #4800 from vieux/rename_network_driver
rename lxc to bridge
Upstream-commit: 97e5295f437bbb9eae26c99842b269aae1b427c2
Component: engine
2014-03-21 16:52:40 -07:00
8e8f727f50 Fix since time exit display when s.FinishedAt is zero
When s.FinishedAt is zero, the since time exit in docker ps doesn't display correct time.
For example
```
Exited (0) 292.471209 years ago
```
This patch fixes the since time exit to display nothing if s.FinishedAt is zero.

Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com> (github: ichik1)
Upstream-commit: 4002eac8b8b4007de03e78dbd57232fac583d05b
Component: engine
2014-03-21 15:28:02 +09:00
2352431354 rename lxc to bridge
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 8944fb2e9b07d5a764f8d48065b9afd73364f640
Component: engine
2014-03-20 21:51:28 +00:00
ca4686cb04 devicemapper: Better/faster shutdown
Right now shutdown is looping over *all* devicemapper
devices and actively deactivating them, this is pretty
slow if you have a lot of non-active containers. We
instead only deactivate the devices that are mounted.

We also do the shutdown unmount using MNT_DETACH which
forces the unmount in the global namespace, even if it
is busy because of some container having it mounted.
This means the device will be freed when that container
exits.

Also, we move the call to waitClose to deactivateDevice
because all callers of any of them call both anyway.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: a9fa1a13c3b0a654a96be01ff7ec19e8009b2094
Component: engine
2014-03-20 17:38:35 +01:00
c037f13ab8 configurable dns search domains
Add a --dns-search parameter and a DnsSearch
configuration field for specifying dns search
domains.

Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
Upstream-commit: fbfac21ed4de550ce72d993810dc07a2c4877a88
Component: engine
2014-03-19 10:49:25 -04:00
9d78f7e8ee cleanup container.stop
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 3b1d590269466217ddf203edcef295f6cec9fcee
Component: engine
2014-03-18 23:48:14 +00:00
9f3a8a726d Merge pull request #4684 from cpuguy83/4682-do_not_sigkill_on_docker_stop
Disable automatic killing of containers when docker stop fails
Upstream-commit: bfbf338f51f90a67e2866358a33e22d576755439
Component: engine
2014-03-18 11:28:42 -07:00
4879ef6f17 Merge pull request #4733 from vieux/3729_time_exit
add time since exit in docker ps
Upstream-commit: 1e56ec8b67e77a1e99f12b7e7c04245477202c9c
Component: engine
2014-03-18 11:25:11 -07:00
856d46eee0 btrfs: build tags
correct filename and make the tag more readable

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 5cfea26bcfc218ca72eac7115fa257833f28b9f2
Component: engine
2014-03-18 13:44:23 -04:00
cdf7c6a1a7 btrfs: build tags
Default to the same build behavior, but allow a go build tag to disable
building of the btrfs graphdriver

	go build -tags no_btrfs' ...
	$ go build
	$ objdump -S docker | grep btrfs | wc -l
	194
	$ go build -tags no_btrfs
	$ objdump -S docker | grep btrfs | wc -l
	1
	# that is a comment ;-)

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 85a62d9b779bfb351e159f38c2fc95900a0532cd
Component: engine
2014-03-18 13:44:22 -04:00
7976f94412 Add err checks for port allocator tests
Docker-DCO-1.1-Signed-off-by: Andy Kipp <andy@rstudio.com> (github: kippandrew)
Upstream-commit: 555416fd02b9e062385dcdaf0c4b9f5de61df388
Component: engine
2014-03-18 13:30:21 -04:00
0ed607c3a6 Be more explicit in finding next port to allocate
Docker-DCO-1.1-Signed-off-by: Andy Kipp <andy@rstudio.com> (github: kippandrew)
Upstream-commit: 73c416a20db8fe48302a6cf0db4c1c0585ed0739
Component: engine
2014-03-18 13:30:21 -04:00
9ecda2cf3a Better test error message
Docker-DCO-1.1-Signed-off-by: Andy Kipp <andy@rstudio.com> (github: kippandrew)
Upstream-commit: 7a1db291fcedd50ce99649e95109187c76da255c
Component: engine
2014-03-18 13:30:21 -04:00
dc2e6deab9 Prevent dynamic allocation of previously allocated ports
Docker-DCO-1.1-Signed-off-by: Andy Kipp <andy@rstudio.com> (github: kippandrew)
Upstream-commit: f7b6fbbd7664634481c8519e58844d572423f3e1
Component: engine
2014-03-18 13:30:21 -04:00
afc3313920 Merge pull request #4674 from vbatts/vbatts-graphdriver_build_tags
graphdriver: build tags
Upstream-commit: f14c0866ecb5ee38be8d6859ced730d431610743
Component: engine
2014-03-18 10:25:59 -07:00
186bfcdec8 devmapper: Increase timeout in waitClose to 10sec
As reported in https://github.com/dotcloud/docker/issues/4389 we're
currently seeing timeouts in waitClose on some systems. We already
bumped the timeout in waitRemove() in
https://github.com/dotcloud/docker/issues/4504.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: a70beda1ecfb049a3f80ad5b159ba51d653fd067
Component: engine
2014-03-18 15:54:40 +01:00
b02e8511f3 runtime: no build tags for vfs driver
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 448b64164df7795cdbd9be0d663269e6e4e4beeb
Component: engine
2014-03-17 21:54:43 -04:00
0ba8b13022 graphdriver: build tags
Enable build tags for all the graphdrivers to be excludable.

As an example:
```
$ go build
$ ls -l docker
-rwxr-xr-x 1 vbatts vbatts 18400158 Mar 14 14:22 docker*
$ go build -tags "exclude_graphdriver_aufs exclude_graphdriver_vfs exclude_graphdriver_devicemapper"
$ ls -l docker
-rwxr-xr-x 1 vbatts vbatts 17467068 Mar 14 14:22 docker*
```

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 670ce98c60dbac1d46a59bd69bd20b569f4794f1
Component: engine
2014-03-17 21:54:05 -04:00
bf660d94fc add time since exit in docker ps
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 15a267b57d2394dd5cb697f9a80b6df4fc939a76
Component: engine
2014-03-18 01:34:43 +00:00
ff82619b66 Refactor out interface specific information from execdriver.Network
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)
Upstream-commit: 659b719aa66e7ed0c3104d3704fa61035050ad82
Component: engine
2014-03-17 22:53:48 +01:00
ccebbeffe2 Fix issue #4681 - No loopback interface within container when networking is disabled.
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)

Remove loopback code from veth strategy

Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)

Looback strategy: Get rid of uneeded code in Create
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)

Use append when building network strategy list

Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)

Swap loopback and veth strategies in Networks list

Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)

Revert "Swap loopback and veth strategies in Networks list"

This reverts commit 3b8b2c8454171d79bed5e9a80165172617e92fc7.

Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)

When initializing networks, only return from the loop if there is an error

Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)
Upstream-commit: 353df19ab7009f6555dee506841ae0b690a08768
Component: engine
2014-03-17 22:01:24 +01:00
c6aab2eaa4 Merge pull request #4723 from vieux/fix_panic_monitor
fix panic in monitor
Upstream-commit: dd040c98706cd8ee3022061a63dc064b31fff890
Component: engine
2014-03-17 13:52:22 -07:00
ec6d6bab54 Merge pull request #4721 from vieux/4716-display_ps-fix
Fix display command display in docker ps
Upstream-commit: 0e92c7c24a64a4cc36b38ffb35f3e8498bcb1790
Component: engine
2014-03-17 22:04:00 +02:00
06d35a04d8 fix panic in monitor
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 1dfc44073399aadb226c1b4c1909fb15c033d44a
Component: engine
2014-03-17 19:33:40 +00:00
511a3e0407 Disable automatic killing of containers when docker stop fails
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 8b5cf51d600dc4f3611cf063c52cf3448e7b01e5
Component: engine
2014-03-17 15:15:44 -04:00
8d099b8012 Gofmt imports
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 2bddcd68b4b927d36ffadd80e098f6d4ae2cf5d6
Component: engine
2014-03-17 11:41:28 -07:00
742b723fc2 Move graphdrivers into runtime top level pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 96c4816cef592a98a235010924bb2417c8451079
Component: engine
2014-03-17 11:40:12 -07:00
68860e9695 Move execdrivers into runtime top level pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: af385151ceedde097eda8a5195b431e8076cf76b
Component: engine
2014-03-17 11:40:12 -07:00
4b7a6e2613 Move networking drivers into runtime top level pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 2230c9b9a735d731cc2fee4137633eb98b9da9d5
Component: engine
2014-03-17 11:40:12 -07:00
cad533fcfe display command display in docker ps
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 5921b186d17b172f205f3b0b6bda1f3a4e650d3f
Component: engine
2014-03-17 18:36:15 +00:00
19c6fcaf73 Merge pull request #4653 from creack/fix_expose_cache
Fix expose cache
Upstream-commit: 28a9ff7f2557d88174b46482a5b402c511684cf7
Component: engine
2014-03-14 16:09:13 +02:00
0fda3b88ac Don't kill by pid for other drivers
Closes #4575
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 3fa99b35b05d9159d6f7f4c7465dec747da2c4e1
Component: engine
2014-03-13 15:04:23 -07:00
c733b13d1a Fix EXPOSE cache miss issue
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: ab26c16b32420011b0aee3de1a3bce5a0afd6f4d
Component: engine
2014-03-13 13:58:09 -07:00
7a46914030 Don't use separate bind mount for container
Since we're not not mounting anything but the base filesystem outside
the container we no longer need the separate bind mount at
/var/lib/docker/container/$id/root in order to see the base filesystem
without extra mounts. So, we drop this and mount (again) the container
root directly at the real basefs mountpoint.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: bf1b27dfcc6c4e049706d7d104e1abc5c330815d
Component: engine
2014-03-13 20:08:29 +01:00
746b307c72 Move all bind-mounts in the container inside the namespace
This moves the bind mounts like /.dockerinit, /etc/hostname, volumes,
etc into the container namespace, by setting them up using lxc.

This is useful to avoid littering the global namespace with a lot of
mounts that are internal to each container and are not generally
needed on the outside. In particular, it seems that having a lot of
mounts is problematic wrt scaling to a lot of containers on systems
where the root filesystem is mounted --rshared.

Note that the "private" option is only supported by the native driver, as
lxc doesn't support setting this. This is not a huge problem, but it does
mean that some mounts are unnecessarily shared inside the container if you're
using the lxc driver.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 6c266c4b42eeabe2d433a994753d86637fe52a0b
Component: engine
2014-03-13 20:01:29 +01:00
57e56c8558 Move execdriver construction into execdriver/execdrivers
This can't be in execdriver (dependency loop) but should not be
hardcoded inside runtime.go either. So we put it in a subpackage.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 07c35b41a5a93f31111d47afcb1e6d2926b492a0
Component: engine
2014-03-11 16:37:19 +01:00
0d48ade882 Add IsRunning to server interface
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 47edf3e8bf759270c243711eaed1faa1d4d61f35
Component: engine
2014-03-09 23:16:15 -07:00
060a86aead Move runtime and container into sub pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 36c3614fdde079fad178390f651945fba884668a
Component: engine
2014-03-09 23:03:40 -07:00