75a4cd19f2
Fix golint errors in api
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c8ce0856b752cecb2f2a2149b79e6e96a63f03dc
Component: engine
2016-08-29 13:36:16 -07:00
ace154f017
Merge pull request #26114 from londoncalling/fix-linespacing-swarmtut
...
fixed line spacing in Swarm tutorial bullets
Upstream-commit: 62215920871b8d15a6ffe538baac5abe2b715409
Component: engine
2016-08-29 12:09:15 -07:00
ab43397cd4
fixed line spacing in Swarm tutorial bullets
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: dcf00020e14f3f10b32e3d72196d390f3083d2ee
Component: engine
2016-08-29 11:53:03 -07:00
76f72c0529
Merge pull request #26110 from icecrime/add_anusha_jana
...
Add Anusha and Jana as maintainers
Upstream-commit: ec73027b719001e1a2695b7cb047cfd0ddc70eb6
Component: engine
2016-08-29 17:28:21 +00:00
fc1ee92165
Add Anusha and Jana as maintainers
...
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: 1a84f0977b83f0c64365649a308fd0d142901636
Component: engine
2016-08-29 10:23:50 -07:00
28302e80b1
Merge pull request #26079 from allencloud/unpause-container-no-running
...
remove running judgement when unpause container
Upstream-commit: 4edb83f4fd7f8fc1b1a6fdbef1cd2367a0f5574c
Component: engine
2016-08-29 10:30:40 -04:00
b901a25ae5
Merge pull request #26086 from icaoweiwei/patch-2016-08-28-3
...
Fix typo
Upstream-commit: 4a62f76f9df1400628cb9398f82eb064b6025acf
Component: engine
2016-08-29 10:28:10 -04:00
edf9053174
Merge pull request #25317 from yongtang/25304-docker-service-create-group
...
Support `--group` in `docker service create`
Upstream-commit: d09c04a667fc2895650b0c2bb25e28fb226e3f31
Component: engine
2016-08-29 10:27:31 -04:00
383b124a13
Merge pull request #26084 from sdurrheimer/zsh-completion-volume-create-name
...
Replace zsh completion for 'docker volume create --name' by 'docker v…
Upstream-commit: ec5aeca38d28b62b0c94799b9fc8e964926080f5
Component: engine
2016-08-29 10:25:25 -04:00
a67f318b1e
Merge pull request #26057 from mwieczorek/fix-25903
...
fix for PR #25903 - spec file support for Windows plugin discovery
Upstream-commit: 3dc19808e01d52b6ebb5e201914863fd6e2d68a2
Component: engine
2016-08-29 09:53:43 -04:00
d155bb2709
Merge pull request #26080 from sw-double/patch-1
...
[docs] Fix volume binding in fluentd container example
Upstream-commit: ad73e8f169ee39ed830bfa385583bddd5741012d
Component: engine
2016-08-29 14:36:49 +02:00
e70aa7c33b
Merge pull request #26101 from allencloud/correct-comments-and-test-log
...
correct some nits in comment and test files
Upstream-commit: 2e752540bf41e8abc4a641a5616890db4159c2d8
Component: engine
2016-08-29 14:28:47 +02:00
17447fd1b0
correct some nits in comment and test files
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 52637848a769b8c80d2f1e28d3d34ada6d35b5a6
Component: engine
2016-08-29 18:37:14 +08:00
c944ae9d41
remove running judgement when unpause container
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 0bac72e4bd71b01b5315ff60b71d8bcb1a96949a
Component: engine
2016-08-29 10:16:18 +08:00
97464f18e4
Merge pull request #25990 from vieux/plugin_inspect
...
add -f to plugin inspect
Upstream-commit: bf0077c138a1cf64a42828014c44f8e2b2001703
Component: engine
2016-08-28 17:03:40 +02:00
0647af3a04
Fix typo
...
Signed-off-by: Cao Weiwei <cao.weiwei30@zte.com.cn >
Upstream-commit: cec564984eff0d850b9ea5814958cda8996f8d4e
Component: engine
2016-08-28 21:30:14 +08:00
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
87d651a44b
Replace zsh completion for 'docker volume create --name' by 'docker volume create {name}'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 85071bda33f5aa3aeee0f9feb371740b21f9c5f9
Component: engine
2016-08-28 12:40:10 +02:00
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
d2efc6a5c4
Fix volume binding in fluentd container example
...
Signed-off-by: Konstantin L <sw.double@gmail.com >
Upstream-commit: c450e608b9b1f79f474dbfb468ab26ae0f741868
Component: engine
2016-08-28 11:45:28 +08:00
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
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
bdcdcdfff5
Support --group-add and --group-rm in docker service create/update
...
This fix tries to address the issue raised in 25304 to support
`--group-add` and `--group-rm` in `docker service create`.
This fix adds `--group-add` to `docker service create` and `docker service update`,
adds `--group-rm` to `docker service update`.
This fix updates docs for `docker service create` and `docker service update`:
1. Add `--group-add` to `docker service create` and `docker service update`
2. Add `--group-rm` to `docker service update`
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: b31969ee365f582eb71a7962af9638d79380cd54
Component: engine
2016-08-27 11:54:05 -07:00
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
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
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
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
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
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
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
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
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
7c9671c819
fix spec file support for Windows plugin discovery ( #25903 )
...
Signed-off-by: Michal Wieczorek <wieczorek-michal@wp.pl >
Upstream-commit: 52c0daad82b424afc661c23c1d80784d014e1a58
Component: engine
2016-08-26 22:11:58 +02:00
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
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
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
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
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
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
0fa4cceabc
Merge pull request #25177 from cpuguy83/fix_TestDaemonDiscoveryBackendConfigReload
...
TestDaemonDiscoveryBackendConfigReload behavior
Upstream-commit: 175f6eb55f61b5caf915db9bd6786a2f2d9103da
Component: engine
2016-08-26 10:54:48 -07:00
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
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
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
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
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
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
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
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
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
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
