Commit Graph

20395 Commits

Author SHA1 Message Date
bd05e8f1c1 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>
Upstream-commit: 6ac9a2f410ad506204faf8f22fc502dc780e3986
Component: engine
2016-01-25 13:22:47 -08:00
7e07ac8939 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>
Upstream-commit: dd7d1c8a02d8693aa4f381f82c5bbdcad9a5ff58
Component: engine
2016-01-25 15:51:28 -05:00
fc335b54af Reject multiple networks on container creation
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: cfa515fd9d1530bd84e98c6d6564e641dcb2d0fe
Component: engine
2016-01-25 12:50:01 -08:00
db8ec5360f 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>
Upstream-commit: 0eed34755e3493dbb6204cb378228e72750609e5
Component: engine
2016-01-25 15:49:56 -05:00
f06c5a3e4c 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>
Upstream-commit: 8a68315c38d7e62b140e145766e842de07d0422d
Component: engine
2016-01-25 11:45:20 -08:00
5bf3651a12 Merge pull request #19615 from runcom/add-registry-with-auth-testsuite
integration-cli: add suite for testing registries with auth
Upstream-commit: 15cc67b73d619cf2a624146b4c19855117f1a842
Component: engine
2016-01-25 11:12:16 -08:00
51c4939d36 Merge pull request #19658 from wenchma/19425-daemon_ipv6
Optimize slow bottleneck tests of TestDaemonIPv6FixedCIDR
Upstream-commit: 997e61add95c26987f56c9b096f6b5ed93641184
Component: engine
2016-01-25 14:04:54 -05:00
dfa2cfc965 Merge pull request #19629 from thaJeztah/fix-api-order
Fix remove API order in menu
Upstream-commit: 7e1b0ea5d770c8bf0af07f6b512e66daef44d04f
Component: engine
2016-01-25 11:02:24 -08:00
d3b74e9005 Merge pull request #19666 from jfrazelle/19620-fix-url
add trailing slash
Upstream-commit: d02ed72e304140c5c8f645af3f61f38ba2ab4c72
Component: engine
2016-01-25 12:12:47 -05:00
e59c1e2d2f add trailing slash
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 0f379fab3195f70f8e565d1deab6051828254a6e
Component: engine
2016-01-25 09:01:46 -08:00
0d8c98487d Optimize slow integration test
Optimize `TestEventsOOMDisableTrue` performance

It's part of #19425 issue.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 6bf5b3db9a06e07591675957c48de8b91eeb21b8
Component: engine
2016-01-26 00:07:20 +08:00
eb32283c48 speed up DockerDaemonSuite.TestDaemonRestartWithContainerRunning
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: c983996e0bdc3becd3c7bf79329ad367b9f1a8b1
Component: engine
2016-01-25 23:45:13 +08:00
328772ec19 Optimize slow bottleneck tests of TestDaemonIPv6FixedCIDR and TestDaemonIPv6FixedCIDRAndMac
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 73849a5c82ed816348179bd0ea6461ec8941cc04
Component: engine
2016-01-25 23:43:49 +08:00
40d356e759 Merge pull request #19655 from sdurrheimer/zsh-completion-cp-follow-link
Add zsh completion for 'docker cp -L --follow-link'
Upstream-commit: 9211fc36a95c0a05a3dffd95b287044394f8ebc0
Component: engine
2016-01-25 09:28:26 -05:00
f507b64609 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…
Upstream-commit: 5719dca1d7a4aab0abbb8bd7a4d6e09c65c678ea
Component: engine
2016-01-25 01:21:57 -08:00
ff47be87f4 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>
Upstream-commit: b3cd453b8447d3d30457f3cbe6839e0b85110a02
Component: engine
2016-01-25 08:21:15 +01:00
1e5a8b2ec5 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>
Upstream-commit: 995d1d09ce37c4bdf67fa6dbef6e572a23f866f6
Component: engine
2016-01-25 08:14:46 +01:00
6a3a8f6686 Add zsh completion for 'docker cp -L --follow-link'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 490ea6961ca1288ccd6165503164e3231dbbf947
Component: engine
2016-01-25 08:09:30 +01:00
10870eb164 Merge pull request #19643 from albers/completion-nospace
fix minor bash completion issue on OSX (compopt)
Upstream-commit: 714587196b4673f1a9522b39de3db975e6cf293e
Component: engine
2016-01-24 20:58:33 -05:00
a47ba23546 Merge pull request #19639 from Microsoft/jjh/incontainerlogic
Windows CI: In container logic flaw
Upstream-commit: 96009914b0a4cc6d40f5dc5fc955eace90871004
Component: engine
2016-01-24 22:19:23 +01:00
41c9949d2d Merge pull request #19641 from albers/completion-syslog-tls
bash completion for syslog over TLS log driver
Upstream-commit: 84e4fb8b0a703e617dc2f50755f704ec71621712
Component: engine
2016-01-24 22:14:54 +01:00
e966ad634b Merge pull request #19636 from albers/completion-daemon--cluster-store-opt
bash completion for new `--cluster-store-opt` values
Upstream-commit: 0764706dcc63b198449a6d912c965ee6f9fb3a9d
Component: engine
2016-01-24 22:12:37 +01:00
639668eac5 Merge pull request #19642 from albers/completion-tag-f
Remove completion for `docker tag -f`
Upstream-commit: 460f4914576041c031fd77e9f46a6238d2415563
Component: engine
2016-01-24 22:10:23 +01:00
09d191ea15 Merge pull request #19633 from albers/completion-ps-filter-dead
bash completion for `docker ps --filter status=dead`
Upstream-commit: a3cfdb5a31c3475894f9104215c138cf4cb3679e
Component: engine
2016-01-24 22:04:56 +01:00
0024a75aeb Merge pull request #19632 from albers/completion-cp--follow-link
bash completion for `docker cp --follow-link`
Upstream-commit: 672ca818692a58c7a4f645b8751a4e104f781ed4
Component: engine
2016-01-24 22:04:26 +01:00
d7e8559cae fix minor bash completion issue on OSX (compopt)
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 6b28e1bbe21b25384c069b99a0b79af3fea17869
Component: engine
2016-01-24 10:28:36 -08:00
993f03d460 remove zsh completion for docker tag -f
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 1bd5424c388e3039196af94b0f1c417a0959c81c
Component: engine
2016-01-24 10:11:18 -08:00
bbd9d34853 remove bash completion for docker tag -f
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 59754c4bd8903d29131e59384067a18dc5b91876
Component: engine
2016-01-24 10:07:04 -08:00
1769947174 bash completion for syslog over TLS log driver
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 6723c8aa26a4265ae3005360cf4e6f37e5442b45
Component: engine
2016-01-24 09:34:30 -08:00
285dba59c1 Windows CI: In container logic flaw
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 5601fc8507d9edb4eb764b7337866ea04f44be54
Component: engine
2016-01-24 09:22:50 -08:00
6a9503b811 bash completion for --cluster-store-opt kv.path discovery.{heartbeat,ttl}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 17eb18899e7a29605c63d71c503ab343af4924b3
Component: engine
2016-01-24 07:24:12 -08:00
32228ff936 bash completion for docker images -f dangling=false
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 7f345f2ec4400bf0ac582f9a39a840173257e98b
Component: engine
2016-01-24 06:36:04 -08:00
666db2e939 bash completion for docker ps --filter status=dead
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 0f654bb5eb4643cb9fa59f6f12d02db2d2520ddb
Component: engine
2016-01-24 05:57:57 -08:00
80f1938271 bash completion for docker cp --follow-link
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 7b3058b864b04ee1e51a64e945d0a76dc5b387a6
Component: engine
2016-01-24 05:39:52 -08:00
881cc64be6 Merge pull request #19624 from WeiZhang555/test-case-name-consistent
Make test case name consistent
Upstream-commit: 7aafa76662986c4268f1130447c1534ae5fc1f1a
Component: engine
2016-01-24 07:16:11 -05:00
93f57e97b4 Fix remove API order in menu
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 42f6e8d40d059c8d53adaada24b400761f42ec5b
Component: engine
2016-01-24 02:48:47 -08:00
bfaa6f239b Fixes #19614
Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com>
Upstream-commit: 0c7201ee736f77e63cd1f191dfd6a3cf549b6def
Component: engine
2016-01-24 10:28:18 +01:00
c418f65372 Merge pull request #19622 from r4j4h/quick-doc-fix
Correcting `overlay` -> `bridge` driver in run.md
Upstream-commit: 037d159981c8f8d79f8f445df502527e635d525c
Component: engine
2016-01-24 00:42:36 -08:00
f308df2986 Correcting overlay -> bridge driver in run.md
Correcting `overlay` -> `bridge` driver in run.md to match the preceding paragraph.

Signed-off-by: Jasmine Hegman <jasmine@jhegman.com>
Upstream-commit: ae5fce9fe02523e7a43ddd533f645d1a8fb20193
Component: engine
2016-01-24 01:34:04 -07:00
48b99fc11d Make test case name consistent
Replace `Tty` with `TTY` in all test case names so that we can run
a bundle of `TTY` related test cases with TESTFLAGS like
`-check.f TestExecTTY*`

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: e151ad936abecce944e3f7c285fa788c2dc1bba1
Component: engine
2016-01-24 16:32:52 +08:00
5c1f1fe462 Merge pull request #19610 from companycy/patch-1
docs: image layers' path in aufs-driver.md
Upstream-commit: a1c6642c4547fb3cbdd41b8ada1a8eb8d0f22afc
Component: engine
2016-01-23 23:37:03 -08:00
7f768a5d6e Merge pull request #19602 from Microsoft/jjh/testrunexitonstdinclose
Windows CI: Fix TestRunExitOnStdinClose flakiness
Upstream-commit: 717ced8dd7aa769de1c19ee982a10394e95eb0e1
Component: engine
2016-01-23 18:53:28 -08:00
45cae822ec Update aufs-driver.md
fix typo in file path for image layers

Signed-off-by: bjcheny <companycy@gmail.com>
Upstream-commit: ac1eac21c91c1b8395a0356699f58f1d91d0d173
Component: engine
2016-01-24 10:03:29 +08:00
29ab7a596d Windows CI: Address simple failures in TestPS*
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 75d107451a16161e2ff54753814936fbf6ca0d02
Component: engine
2016-01-23 16:33:45 -08:00
29bd8bf391 integration-cli: add suite for testing registries with auth
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 011b4f01f4aca365c88900b196b1c96f7889631d
Component: engine
2016-01-24 01:02:49 +01:00
978fdc0ffc Windows CI: Fix api_containers_test.go
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 2b0a742237d223f21717d722b4622458af870526
Component: engine
2016-01-23 14:40:25 -08:00
eb437391da Update registry version in Dockerfile.armhf
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
Upstream-commit: 11a51649cf1fe677fd54e277c2530020fcfbe84b
Component: engine
2016-01-23 18:46:46 +01:00
16c51540a2 Windows CI: Fix TestRename*
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f21fb2162eaf1497e34a3cbddc9d51deec2929d1
Component: engine
2016-01-23 09:25:10 -08:00
0b5c48a6e3 Windows CI: Porting for docker_api_images_test.go
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 80b057067104b08886fbcf16d060ce82c0efb7c9
Component: engine
2016-01-22 21:13:38 -08:00
71f0714dde Merge pull request #19600 from aaronlehmann/buildenvusage2
Slight TestBuildEnvUsage2 speedup
Upstream-commit: 7be8f7264435db8359ec9fd18362391bad1ca4d7
Component: engine
2016-01-22 20:38:45 -08:00