Doug Davis
207ba5d7c0
Merge pull request #26081 from icaoweiwei/patch-2016-08-28-2
...
Fix typo
Upstream-commit: 026f404dad4ed289e4070e4ef9e204b78129b529
Component: engine
2016-08-28 07:07:54 -04:00
Cao Weiwei
76de74a73a
Fix typo
...
Signed-off-by: Cao Weiwei <cao.weiwei30@zte.com.cn >
Upstream-commit: cdcf7b78fc21f902c2c4fe42812763b0fbb36976
Component: engine
2016-08-28 17:01:22 +08:00
Arnaud Porterie
63926fbdf3
Merge pull request #26055 from mavenugo/ndn
...
Support container disconnect for non-existing network
Upstream-commit: 9ea28ea8944744d9dc8f50bdc1733868fda6ce7f
Component: engine
2016-08-28 01:48:02 +00:00
Tõnis Tiigi
df05e493e4
Merge pull request #26068 from allencloud/add-warnings-in-containerCreate
...
add warning in containerCreate response
Upstream-commit: 49f51c18feca099685fa6e2f33e644706a7cf122
Component: engine
2016-08-27 18:47:37 -07:00
Vincent Demeester
38d8783059
Merge pull request #26036 from yuexiao-wang/add-gcplog
...
Add the content for Google Cloud Loging driver in index
Upstream-commit: 48659599cbb4c896e9597e50ae16c087d9dd5ac9
Component: engine
2016-08-27 14:51:16 +02:00
Vincent Demeester
1647b02210
Merge pull request #25828 from yuexiao-wang/clean-docs
...
clean up the run.md in reference
Upstream-commit: 2cec66d0f548a274d723dbdfb27d3fafb6df7ec2
Component: engine
2016-08-27 14:50:47 +02:00
allencloud
f3da2f28dc
add warning in containerCreate response
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 5d6023cf8ebf6c3097d7a4b88a102a270f0d740d
Component: engine
2016-08-27 10:49:26 +08:00
Madhu Venugopal
8bee71dfee
Support container disconnect for non-existing network
...
There are cases such as migrating from classic overlay network to the
swarm-mode networking (without kv-store), such a mechanism to allow
disconnecting a container even when a network isnt available will be
useful.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 05a3f2666ee34c2dfa04663bbdda3c7763b001d8
Component: engine
2016-08-26 16:48:52 -07:00
Charles Smith
0d384275a3
Merge pull request #26028 from londoncalling/docs-pinata-for-swarm
...
Clarify how to use d4mac, d4win with swarm mode
Upstream-commit: 6072e6bfd20598f4e9cb28d32c09bfddec6df76c
Component: engine
2016-08-26 15:55:26 -07:00
Victoria Bialas
ea8723156f
WIP:Clarify how to use d4mac, d4win with Swarm mode
...
updated d4mac, d4win clarification per Charles's comments
copyedits and streamline wording
fixed links
streamlined, fixed line wraps
incorporated more review comments
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
incorporated more review comments
incorporated more edit comments and fixed line wraps
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 566c2c9d3236b0adffaca425db5d4bac66ba8c1c
Component: engine
2016-08-26 15:42:45 -07:00
Tibor Vass
67ccfbdecc
Merge pull request #25424 from vieux/enabled
...
replace active by enabled for consistency in plugins
Upstream-commit: ed0dff8f16716b4f6debfc191124e98750dd05bb
Component: engine
2016-08-26 15:22:41 -07:00
Michael Crosby
aff46171d8
Merge pull request #26005 from q384566678/branch-test
...
Optimize the restart function code
Upstream-commit: 07328cf3f6e2c46ca808fde251d8a1ae85995f01
Component: engine
2016-08-26 15:14:49 -07:00
Alexander Morozov
24f71df076
Merge pull request #25861 from WeiZhang555/wait-remove-for-start
...
Using waitExitOrRemoved for `docker start`
Upstream-commit: bdadcfc1bbb04950c4835cfa4d75f0e480555a2f
Component: engine
2016-08-26 13:36:56 -07:00
Tibor Vass
839898d091
Merge pull request #26050 from boucher/rb-upgrade-containerd
...
Upgrade containerd to latest version.
Upstream-commit: d55b3ff568f998fc3f471c1f25110da43f59bbc4
Component: engine
2016-08-26 12:53:03 -07:00
Vincent Demeester
d5c2d4c2f5
Merge pull request #23830 from ardnaxelarak/23345_remove_name_from_volume_create
...
remove --name flag from volume create
Upstream-commit: 5168c93419547338b11f5d24d24a2a025ea64524
Component: engine
2016-08-26 21:52:07 +02:00
Tibor Vass
99413dbbab
Merge pull request #26049 from crosbymichael/match-panic
...
Check for non-nil container after match
Upstream-commit: 054f681eb88af7657a88bf350590012592281137
Component: engine
2016-08-26 11:45:34 -07:00
Arnaud Porterie
71cbf188b7
Merge pull request #23614 from icecrime/inspect_services
...
Allow `docker inspect` on all types
Upstream-commit: 6e85b81df2f0a2485b74409813eaa77a2b366685
Component: engine
2016-08-26 18:45:23 +00:00
Antonio Murdaca
85179b9c8d
Merge pull request #26048 from dnephin/fix_daemon_subcommand
...
Fix daemon command proxy
Upstream-commit: 575f37282d6073fe1cdc7057713b19b00080a5a0
Component: engine
2016-08-26 20:30:18 +02:00
boucher
0ef65cbad6
Upgrade containerd to latest version.
...
Necessary for merging in #22049 .
Signed-off-by: Ross Boucher <rboucher@gmail.com >
Upstream-commit: e0123adafdc1e6a14a1dac10c5371da11b6fc063
Component: engine
2016-08-26 14:17:35 -04:00
Michael Crosby
0fa4cceabc
Merge pull request #25177 from cpuguy83/fix_TestDaemonDiscoveryBackendConfigReload
...
TestDaemonDiscoveryBackendConfigReload behavior
Upstream-commit: 175f6eb55f61b5caf915db9bd6786a2f2d9103da
Component: engine
2016-08-26 10:54:48 -07:00
Brian Goff
9d1926d2b8
Merge pull request #23024 from rhatdan/selinux
...
We need to relabel newly created container volumes
Upstream-commit: 6b4fd5f071a1ca240b2ab33439cdf38a5f4004ab
Component: engine
2016-08-26 13:25:38 -04:00
Michael Crosby
3b8068c818
Check for non-nil container after match
...
There can be a race between getting the container ids for matches and
getting the actual container. This makes sure that we check that the
container returned by `Get` is non-nil before adding it to the list of
matches.
Fixes #25991
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: a020ec4c8b476a814eb137e216fe9d723524fc3b
Component: engine
2016-08-26 10:02:10 -07:00
Michael Crosby
be2930b6c9
Merge pull request #26045 from runcom/systemd-cgroup-fix
...
daemon: ensure systemd cgroup is passed down to runtimes
Upstream-commit: 1dc87122ccb69741a6de2c933aed2d48b0b482a8
Component: engine
2016-08-26 09:59:22 -07:00
Tõnis Tiigi
a2fd7a06e8
Merge pull request #25650 from pwzgorilla/master
...
replace `handleWithGlobalMiddlewares` with `handlerWithGlobalMiddlewa…
Upstream-commit: e875370af81474d9df09433404ef79e403ba1b2f
Component: engine
2016-08-26 09:51:51 -07:00
Aaron Lehmann
54cfd027ab
Merge pull request #24514 from cpuguy83/fix_log_follow_rotate
...
Fix issues with tailing rotated jsonlog file
Upstream-commit: cbd4e4d48ae2edda79be962f6136c6ae9edad7b9
Component: engine
2016-08-26 09:47:40 -07:00
Brian Goff
73666f6379
Merge pull request #25943 from yongtang/25863-ip-address-validation
...
Validate `--ip` and `--ip6` for `docker create`
Upstream-commit: 416fc7ffe4d04be725e307e2ec5063c0364d78d2
Component: engine
2016-08-26 12:32:00 -04:00
Daniel Nephin
93e5c65732
Fix daemon command proxy.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a594cd89919ab3e1aacefb4368c620e308ad0b5d
Component: engine
2016-08-26 12:19:02 -04:00
Brian Goff
aa95624624
TestDaemonDiscoveryBackendConfigReload behavior
...
`TestDaemonDiscoveryBackendConfigReload` was doing some wierd things
with files, creating a file (directly in `./integration-cli`), removing
it, then creating a new file.
This is just weird, so fixed it to use a single file, file will go into
a temp dir so it doesn't pollute integration-cli.
It was also blindly sending a SIGHUP to the daemon process then sleeping
for 3 seconds. This is racey, and slow.
Change this to look for the daemon-reload event in the event stream.
Reload logic is moved to a separate function and blocks (w/ a timeout)
waiting for the reload event to fire.
Runtime of the test is now ~0.5s on my machine, where as it was a
minimum of 3s due to the `time.Sleep` before.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 20f99a8634accf54a923982f8c9a3b6719933f74
Component: engine
2016-08-26 11:02:04 -04:00
Antonio Murdaca
cf80bd3fa8
daemon: ensure systemd cgroup is passed down to runtimes
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 7f88fca48ed34370238ee1b16a262be3ecea8cbe
Component: engine
2016-08-26 15:33:26 +02:00
Doug Davis
0c629aa456
Merge pull request #26030 from yongtang/08252016-doc-docker-create-rm
...
Update docs for `docker create` to include `--rm` flag
Upstream-commit: 91ec7fa811c7476b7c20e3b95a92ea9062d498fa
Component: engine
2016-08-26 09:06:30 -04:00
Vincent Demeester
da5307e5c4
Merge pull request #26035 from sakeven/fmt_dockerfile_error_message
...
Fmt dockerfile error message
Upstream-commit: 06829ce8d65d8dc581f3a62adf3fe8d189439ed4
Component: engine
2016-08-26 14:47:22 +02:00
sakeven
cf918862de
fmt dockerfile error message
...
Signed-off-by: sakeven <jc5930@sina.cn >
Upstream-commit: 7d75e42bc9d0f19f8829b65634495965f02e89a3
Component: engine
2016-08-26 18:36:30 +08:00
mgniu
7f172d7bce
change comment
...
Signed-off-by: mgniu <mgniu@dataman-inc.com >
Upstream-commit: c5ecf1e6fe98cbf9a20d59f9ca5eb69f9c72210b
Component: engine
2016-08-26 18:30:41 +08:00
Antonio Murdaca
908de2cc1b
Merge pull request #26029 from WhisperingChaos/25918-permissive-to-privileged
...
Fixes #25918 - Changed --permissive to --privileged.
Upstream-commit: 91fdafb79f1532de33e2e258446d6eab80fd0d53
Component: engine
2016-08-26 12:06:58 +02:00
yuexiao-wang
d64a2f9915
Add the content for Google Cloud Loging driver in index
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 9e66ddaf3d01f6c94f33b96a790ee9171086f380
Component: engine
2016-08-26 17:30:32 +08:00
zhouhao
8cf6773731
Optimize the restart function code
...
Signed-off-by: zhouhao <zhouhao@cn.fujitsu.com >
Upstream-commit: 870cf1096f2ba000e67d4f0f3fabba146fe0cfe0
Component: engine
2016-08-26 14:22:39 +08:00
Vincent Demeester
2056c2799d
Merge pull request #26016 from vdemeester/docs-restart-policy-api-changes
...
Update docker remote api to mention restart policy validation
Upstream-commit: 48ff20c79527096ab8ca9c4be6773e4133afc617
Component: engine
2016-08-26 07:57:53 +02:00
Vincent Demeester
2aa34a7405
Merge pull request #25919 from yuexiao-wang/fix-refer
...
Remove the redundant words in reference for swarm
Upstream-commit: 72e7cd75c1f7a636b48774c3ba189cc8fd510138
Component: engine
2016-08-26 07:57:07 +02:00
Yong Tang
7045275ed8
Update documentation for validation of --ip and ip6.
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 5118dd2992aef27890203b7e8eb62fc5f507d931
Component: engine
2016-08-25 22:11:56 -07:00
Yong Tang
6068b202c6
Validate --ip and --ip6 for docker create
...
This fix tries to fix the issue raised in 25863 where `--ip` value
is not validated for `docker create`. As a result, the IP address
passed by `--ip` is not used for `docker create` (ignored silently).
This fix adds validation in the daemon so that `--ip` and `--ip6`
are properly validated for `docker create`.
An integration test has been added to cover the changes.
This fix fixes 25863.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: c7045eb93523df76feb9f3e00540e69471a1855e
Component: engine
2016-08-25 22:11:23 -07:00
Yong Tang
32f7fca331
Update docs for docker create to include --rm flag
...
Since 20848 has been merged and both `docker create` and
`docker run` share the same `runconfig` parser, now both
`docker run` and `docker create` allow to specify the
`--rm` flag. However, docs for `docker create` has not
been udpated yet.
This fix updates docs for `docker create` so that `--rm`
flag has been included.
This fix is related to 20848 and 25577.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: d7468cff4d672f118cb12a6b169c3098ea620b7e
Component: engine
2016-08-25 22:05:38 -07:00
Victor Vieux
e44f33953e
replace active by enabled for consistency in plugins
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: cf4e268115911e9e4a4da94dc00b2dc370f86a47
Component: engine
2016-08-25 20:42:49 -07:00
yuexiao-wang
c482fb6e34
Remove the redundant description
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 8bcc8ebaccee981330a2e9b2bc9ad17c3a460d5d
Component: engine
2016-08-26 08:36:34 +08:00
Arnaud Porterie (icecrime)
83ee5a765b
Refactor docker inspect to work on all types
...
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: 3db9f7afce03b1926fd6ba22483ebf0d76d2a1da
Component: engine
2016-08-25 16:29:08 -07:00
Kara Alexandra
346f8a271b
Add option to specify name without --name in volume create
...
Signed-off-by: Kara Alexandra <kalexandra@us.ibm.com >
Upstream-commit: ba3f0bf0e7d4f94eb94023278adcfad4ca8fe9d7
Component: engine
2016-08-25 14:20:06 -07:00
Daniel Nephin
de17e6a998
Merge pull request #25354 from dnephin/remove-mflag-from-dockerd
...
Convert docker and dockerd commands to spf13/cobra
Upstream-commit: 25587906d122c4fce0eb1fbd3dfb805914455f59
Component: engine
2016-08-25 17:19:19 -04:00
Brian Goff
96bd4464ee
Merge pull request #25992 from anusha-ragunathan/legacy_cleanup
...
Cleanup handleLegacy logic.
Upstream-commit: 5761d8b342f0d6352f591968fbe20b4298c4de22
Component: engine
2016-08-25 17:13:47 -04:00
Rich Moyse
de5170b89d
Fixes #25918 - Changed --permissive to --privileged.
...
Signed-off-by: Rich Moyse <rich@moyse.us >
Upstream-commit: b63ce3305c1dd3aec307bbe3bfe0aead295137cb
Component: engine
2016-08-25 16:49:37 -04:00
Alexander Morozov
4cad859c7a
Merge pull request #25978 from justincormack/no-no-gccgo
...
Remove gccgo support
Upstream-commit: 8d99dfbc69a18cbf1e604b845df76fdedcf2e853
Component: engine
2016-08-25 12:12:29 -07:00
Vincent Demeester
9aa1f9aa60
Merge pull request #25896 from raksonibs/fix/docs_step_6
...
Email deprecation for step 6 of tutorial
Upstream-commit: 4e4ebbe34040f557775b59d111a8127f1f7df9a2
Component: engine
2016-08-25 21:06:20 +02:00
