c539be8833
Allow network configuration via daemon config file.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-25 18:54:56 -05:00
2b97c96742
Merge pull request #19074 from arun-gupta/couchbase
...
adding docs for Dockerizing Couchbase service
2016-01-25 15:46:56 -08:00
31adcc96d0
Merge pull request #19682 from aaronlehmann/transfer-release-race
...
Fix watching a released transfer
2016-01-25 15:37:47 -08:00
f7abff4f81
Merge pull request #19560 from aboch/mn
...
Reject multiple networks on container creation request
2016-01-25 14:57:51 -08:00
722fac7a73
Change the way we install from backports in the deb builder (to force deps too)
...
Also, add "libsystemd-journal-dev" to the explicit list (which is what prompted the change in how we install).
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-01-25 14:49:05 -08:00
0f0c35960f
Merge pull request #19674 from tonistiigi/19652-fix-create-error-message
...
Fix error message in container creation
2016-01-25 23:47:57 +01:00
cf44f17258
Merge pull request #19619 from WeiZhang555/test-bottleneck-oomtrue
...
Optimize TestEventsOOMDisableTrue
2016-01-25 14:24:46 -08:00
156e2f0e5c
Merge pull request #19555 from hypriot/update-registry-on-dockerfile-armhf
...
Update registry version in Dockerfile.armhf
2016-01-25 14:14:00 -08:00
268a20af95
Merge pull request #19528 from cpuguy83/19475_abck_compat_for_vol_drivers
...
Add back compat for volume drivers `Get` and `Ls`
2016-01-25 13:53:51 -08:00
733245b2e7
Save endpoint config only if endpoint creation succeeds
...
- Currently it is being save upfront...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-25 13:43:32 -08:00
3e2b50ccaa
Fix watching a released transfer
...
Things could go wrong if Watch was called after the last existing
watcher was released. The call to Watch would succeed even though it was
not really adding a watcher, and the corresponding call to Release would
close hasWatchers a second time.
The fix for this is twofold:
1. We allow transfers to gain new watchers after the watcher count has
touched zero. This means that the channel returned by Released should
not be closed until all watchers have been released AND the transfer is
no longer tracked by the transfer manager, meaning it won't be possible
for additional calls to Watch to race with closing the channel returned
by Released.
The Transfer interface has a new method called Close so the transfer can
know when the transfer manager no longer references it.
Remove the Cancel method. It's not used and should not be exported.
2. Even though (1) makes it possible to add watchers after all the
previous watchers have been released, we want to avoid doing this in
practice. A transfer that has had all its watchers released is in the
process of being cancelled, and attaching to one of these will never be
the correct behavior. Add a check if a watcher is attaching to a
cancelled transfer. In this case, wait for the transfer to be removed
from the map and try again. This will ensure correct behavior when a
watcher tries to attach during the race window.
Either (1) or (2) should be sufficient to fix the race involved here,
but the combination is the most correct approach. (1) fixes the
low-level plumbing to be resilient to the race condition, and (2) avoids
using it in a racy way.
Fixes #19606
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-25 13:28:02 -08:00
1431b623a4
Make volume dangling filter return only used volumes with `dangling=false`.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-25 16:26:51 -05:00
6ac9a2f410
Vendor libnetwork v0.6.0-rc3
...
- Fixes docker/docker#19576
- Fixed embedded DNS to listen in TCP as well
- Fixed a race-condition in IPAM to choose non-overlapping subnet for concurrent requests
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-25 13:22:47 -08:00
dd7d1c8a02
On container rm, don't remove named mountpoints
...
This makes it so when calling `docker run --rm`, or `docker rm -v`, only
volumes specified without a name, e.g. `docker run -v /foo` instead of
`docker run -v awesome:/foo` are removed.
Note that all volumes are named, some are named by the user, some get a
generated name. This is specifically about how the volume was specified
on `run`, assuming that if the user specified it with a name they expect
it to persist after the container is cleaned up.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-25 15:51:28 -05:00
cfa515fd9d
Reject multiple networks on container creation
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-25 12:50:01 -08:00
0eed34755e
Fix removing mountpoints on container rm fail
...
Ensure that the the container's mountpoints are cleaned up if the
container is force removed.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-25 15:49:56 -05:00
8a68315c38
Fix error message in container creation
...
Error message was different if image was specified with the full ID.
Fixes #19652
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-01-25 11:45:20 -08:00
15cc67b73d
Merge pull request #19615 from runcom/add-registry-with-auth-testsuite
...
integration-cli: add suite for testing registries with auth
2016-01-25 11:12:16 -08:00
997e61add9
Merge pull request #19658 from wenchma/19425-daemon_ipv6
...
Optimize slow bottleneck tests of TestDaemonIPv6FixedCIDR
2016-01-25 14:04:54 -05:00
7e1b0ea5d7
Merge pull request #19629 from thaJeztah/fix-api-order
...
Fix remove API order in menu
2016-01-25 11:02:24 -08:00
d02ed72e30
Merge pull request #19666 from jfrazelle/19620-fix-url
...
add trailing slash
2016-01-25 12:12:47 -05:00
48d7cbea55
Merge pull request #19663 from mountkin/speedup-TestDaemonRestartWithContainerRunning
...
speed up DockerDaemonSuite.TestDaemonRestartWithContainerRunning
2016-01-25 12:08:24 -05:00
0f379fab31
add trailing slash
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-25 09:01:46 -08:00
6bf5b3db9a
Optimize slow integration test
...
Optimize `TestEventsOOMDisableTrue` performance
It's part of #19425 issue.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-01-26 00:07:20 +08:00
c983996e0b
speed up DockerDaemonSuite.TestDaemonRestartWithContainerRunning
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-01-25 23:45:13 +08:00
73849a5c82
Optimize slow bottleneck tests of TestDaemonIPv6FixedCIDR and TestDaemonIPv6FixedCIDRAndMac
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-01-25 23:43:49 +08:00
9211fc36a9
Merge pull request #19655 from sdurrheimer/zsh-completion-cp-follow-link
...
Add zsh completion for 'docker cp -L --follow-link'
2016-01-25 09:28:26 -05:00
5719dca1d7
Merge pull request #19657 from sdurrheimer/zsh-completion-new-syslog-over-tls-options
...
Add zsh completion for new 'docker daemon --log-opt syslog-tls-ca-cer…
2016-01-25 01:21:57 -08:00
9609cb7344
Merge pull request #19656 from sdurrheimer/zsh-completion-daemon-cluster-store-opt
...
Add zsh completion for new 'docker daemon --cluster-store-opt discove…
2016-01-25 01:21:23 -08:00
b3cd453b84
Add zsh completion for new 'docker daemon --log-opt syslog-tls-ca-cert syslog-tls-cert syslog-tls-key syslog-tls-skip-verify' options
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-25 08:21:15 +01:00
995d1d09ce
Add zsh completion for new 'docker daemon --cluster-store-opt discovery.heartbeat discovery.ttl kv.path' options
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-25 08:14:46 +01:00
490ea6961c
Add zsh completion for 'docker cp -L --follow-link'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-25 08:09:30 +01:00
714587196b
Merge pull request #19643 from albers/completion-nospace
...
fix minor bash completion issue on OSX (compopt)
2016-01-24 20:58:33 -05:00
96009914b0
Merge pull request #19639 from Microsoft/jjh/incontainerlogic
...
Windows CI: In container logic flaw
2016-01-24 22:19:23 +01:00
84e4fb8b0a
Merge pull request #19641 from albers/completion-syslog-tls
...
bash completion for syslog over TLS log driver
2016-01-24 22:14:54 +01:00
0764706dcc
Merge pull request #19636 from albers/completion-daemon--cluster-store-opt
...
bash completion for new `--cluster-store-opt` values
2016-01-24 22:12:37 +01:00
460f491457
Merge pull request #19642 from albers/completion-tag-f
...
Remove completion for `docker tag -f`
2016-01-24 22:10:23 +01:00
a3cfdb5a31
Merge pull request #19633 from albers/completion-ps-filter-dead
...
bash completion for `docker ps --filter status=dead`
2016-01-24 22:04:56 +01:00
672ca81869
Merge pull request #19632 from albers/completion-cp--follow-link
...
bash completion for `docker cp --follow-link`
2016-01-24 22:04:26 +01:00
65530f8014
Merge pull request #19634 from albers/completion-images--filter-dangling
...
bash completion for `docker images --filter dangling=false`
2016-01-24 22:04:00 +01:00
6b28e1bbe2
fix minor bash completion issue on OSX (compopt)
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-24 10:28:36 -08:00
1bd5424c38
remove zsh completion for `docker tag -f`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-24 10:11:18 -08:00
59754c4bd8
remove bash completion for `docker tag -f`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-24 10:07:04 -08:00
6723c8aa26
bash completion for syslog over TLS log driver
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-24 09:34:30 -08:00
5601fc8507
Windows CI: In container logic flaw
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-24 09:22:50 -08:00
17eb18899e
bash completion for `--cluster-store-opt kv.path discovery.{heartbeat,ttl}`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-24 07:24:12 -08:00
7f345f2ec4
bash completion for `docker images -f dangling=false`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-24 06:36:04 -08:00
0f654bb5eb
bash completion for `docker ps --filter status=dead`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-24 05:57:57 -08:00
7b3058b864
bash completion for `docker cp --follow-link`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-24 05:39:52 -08:00
7aafa76662
Merge pull request #19624 from WeiZhang555/test-case-name-consistent
...
Make test case name consistent
2016-01-24 07:16:11 -05:00
David Calavera
Sebastiaan van Stijn
Tibor Vass
Tianon Gravi
Antonio Murdaca
Alessandro Boch
Aaron Lehmann
Madhu Venugopal
Brian Goff
Tonis Tiigi
Jessica Frazelle
Zhang Wei
Shijiang Wei
Wen Cheng Ma
Steve Durrheimer
Vincent Demeester
Harald Albers
John Howard