e1cfecec53
Add docs for docker network create --attachable
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 7433d3acf61142bb1abbf7928ff0e20acf3eda56
Component: engine
2016-12-14 08:39:10 -08:00
6abf315fff
Merge pull request #29382 from yuexiao-wang/fix-wait-man
...
Update the manual for docker wait
Upstream-commit: 2333af9e594560528419174fbd345265019c5e12
Component: engine
2016-12-14 15:29:33 +01:00
4734e1c8cf
Merge pull request #29401 from bfirsh/add-swagger-display-name
...
Add display name for tags in swagger.yaml
Upstream-commit: 1474a451b14fb164a20de7f64a07ab7c0e526a36
Component: engine
2016-12-14 15:28:22 +01:00
e56158d95b
Add make command for previewing API docs
...
Much easier than the previous method of copying over to the docs
repository and generating the docs.
And, as @cpuguy83 pointed out, that actually didn't work
because the PR that adds Swagger docs isn't merged yet. Oopsy.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: 27ca33e965b78df4d0e7be5597c2f48d9286775f
Component: engine
2016-12-14 12:27:32 +00:00
7025bc9a7b
Add display name for tags in swagger.yaml
...
In #29071 , we made the tags the correct name for generating types,
at the expense of the menu in the documentation looking good.
ReDoc now has support for tag display names
( https://github.com/Rebilly/ReDoc/pull/152 ), so we can assign
a more human-friendly name to the menu items.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: 0caa6c218c89147b2d61a1bbb87c48ad16495a11
Component: engine
2016-12-14 12:00:04 +00:00
a3abb2b59e
Update the manual for docker wait
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 303ff807f2690c1f572439bb5bc53a9ba89bf48f
Component: engine
2016-12-14 18:22:59 +08:00
b35ecdcd72
Merge pull request #29374 from mavenugo/exp
...
Add the missing experimental ipvlan network driver
Upstream-commit: 98fef1cb0b22b8dca2f88d637e01cf0a5df94798
Component: engine
2016-12-13 20:03:24 -08:00
f541c344f4
Merge pull request #29008 from cpuguy83/refcount_graphdriver
...
Refcount graphdriver plugins properly
Upstream-commit: af50cefe6cdf07e2028b9ad934a2cb5818a935eb
Component: engine
2016-12-13 19:24:46 -08:00
269a50e61f
Merge pull request #29198 from allencloud/return-no-swarm-when-unlock-normal-node
...
return node is not a swarm when unlock a normal node
Upstream-commit: 96f7fedc1e9145f8fd6e8bb2f895fd22e95e6352
Component: engine
2016-12-13 18:59:06 -08:00
e8408eec28
Merge pull request #29283 from cpuguy83/fix_plugin_live_restore
...
Fix issues with plugin and `--live-restore`
Upstream-commit: e23c5fcdbb4f2b29aef3777c3709bc854a72b762
Component: engine
2016-12-13 17:11:59 -08:00
9e9a89f944
Pass daemon experiemental flag to libnetwork
...
Required to enable ipvlan experimental network driver
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: b0eef4e427fc87826dd8abd59d09365abdfbedbb
Component: engine
2016-12-13 14:22:54 -08:00
9125d5e539
Vendor libnetwork with experimental daemon flag handling
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 8e6969d846830d7f56d7070956fba88e9c8848ed
Component: engine
2016-12-13 14:22:48 -08:00
2aa298ba4e
Fix issues with plugin and --live-restore
...
Fixes an issue when starting the daemon with live-restore
where previously it was not set, plugins are not running.
Fixes an issue when starting the daemon with live-restore, the plugin
client (for interacting with the plugins HTTP interface) is not set,
causing a panic when the plugin is called.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: cb6633175c0de0a7ae155c4d378cd2379681554b
Component: engine
2016-12-13 16:11:59 -05:00
cc92db8852
Merge pull request #29288 from Microsoft/jjh/promptusestdin
...
Windows: Prompt fix use regular stdin
Upstream-commit: 5665c7364241e451a507a9e8024b6a8b43675527
Component: engine
2016-12-13 21:18:54 +01:00
25c6df8b2c
Merge pull request #29349 from vdemeester/try-to-fix-win2lin
...
Fix failures on Win2lin
Upstream-commit: 39473dad5425d734fdc73df0a678c6edc3d4054b
Component: engine
2016-12-13 08:35:25 -08:00
3e4fb722f6
Merge pull request #29361 from thaJeztah/update-service-ps-reference
...
Update reference docs for service ps
Upstream-commit: 59a496e664544cb879190030b8af0d51c73bc8ce
Component: engine
2016-12-13 16:59:37 +01:00
6ccaba610c
Merge pull request #29000 from yongtang/24352-swarm-update-no-flags
...
Show usage when `docker swarm update` has no flags
Upstream-commit: cda04547c09c418dc0d5f99266757eeeb522f7bd
Component: engine
2016-12-13 16:07:02 +01:00
45956924f2
Merge pull request #29359 from yuexiao-wang/fix-network-option
...
Fix the option name for network
Upstream-commit: 525c7bb9301a29964a8b9f977a469823cbd730fb
Component: engine
2016-12-13 15:20:25 +01:00
1a10407a76
Fix the incorrect option name
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: b101e451f115840a05a6a6b412e06137f16fc64c
Component: engine
2016-12-14 04:10:09 +08:00
f5a62125bb
Merge pull request #29346 from xlgao-zju/just-return-assignment
...
Get rid of err altogether by just returning the assignment
Upstream-commit: 96ac223a1373848b1e5532af6a9887a2ede17de8
Component: engine
2016-12-13 15:19:45 +01:00
caf5d45bd8
Merge pull request #29335 from tophj-ibm/skip-plugin-test
...
[integration-cli] skip plugin tests on non-x86
Upstream-commit: c2b7480604f6692ae0ef8a9b1763cd8e60f12fb5
Component: engine
2016-12-13 14:54:41 +01:00
9c84f95c6e
Show usage when docker swarm update has no flags
...
This fix tries to address the issue raised in 24352. Previously,
when `docker swarm update` has no flags, the output is
```
Swarm updated.
```
even though nothing was updated. This could be misleading for
users.
This fix tries to address the issue by adding a `PreRunE` function
in the command so that in case no flag is provided (`cmd.Flags().NFlag() == 0`),
the usage will be outputed instead.
An integration has been added to cover the changes.
This fix fixes 24352.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 5aa5a1cb008963ee6a99011b8f7cd1f489e2bc6a
Component: engine
2016-12-13 05:05:04 -08:00
30be95cf13
Update reference docs for service ps
...
commit bbd2018ee19eff5594ae3986bf56fbcd0044699d
changed the output format of `docker service ps`.
this patch updates the reference docs
to match the updated output format.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5902fa33840507706e6e9b189fec0adeb20affa5
Component: engine
2016-12-13 13:30:58 +01:00
252ac47c97
Merge pull request #29216 from allencloud/add-status-code-403-for-services-create
...
add missing status code 403 for services/create in docs
Upstream-commit: 1bc942597d4a4cfb16493f416eb1c4c36029819b
Component: engine
2016-12-13 12:27:56 +01:00
5503d01466
Merge pull request #29348 from lixiaobing10051267/masterMount
...
modify some wrong func information in device_tool.go
Upstream-commit: ce9960a9b20cbad3a811c42fbb848ddb95be0446
Component: engine
2016-12-13 12:23:43 +01:00
cc3da24d75
Fixing win2lin builds by adding a testRequires to DockerDaemonSuite
...
The success of the win2lin CI before was really "by chance" on the
DockerDaemonSuite : the DockerDaemonSuite was panicking when starting
the daemon on the first non-skipped test.The suite panicked but as
the error returned from `StartWithBusybox` was nil, the test kept
going and was OK because the client had all the correct environment
variables set up to discuss with the remote daemon.
Then, as the suite panicked, no more test attached on the
DockerDaemonSuite ran (that's why on win2lin, `DockerDaemonSuite` was
only composed by 5 tests !). The really bad thing is, we didn't get
any report of the panic on the suite (go-check hiding something
somewhere).
As DockerDaemonSuite needs to run test on the same host as it's
running, this adds a `SameHostDaemon` requirement to the Suite.
This changes also make sure `TestRestartContainerWithRestartPolicy`
does left weirdies behind it.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: e857785df4b53df551ad25d132bc0274923f2e53
Component: engine
2016-12-13 12:04:53 +01:00
1bef3cf8f2
stack_config.md not exist and delete it
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: afaff51a8b59630f880493679906acc3acc3005a
Component: engine
2016-12-13 18:06:18 +08:00
925c1d5b69
modify some wrong func information in device_tool.go
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: cde57a0d56a034975c5a6f4e07d807b8ce66f331
Component: engine
2016-12-13 17:49:03 +08:00
d26a2271f7
Merge pull request #28437 from thaJeztah/deprecate-default-network-inspect
...
deprecate "top-level" network information in NetworkSettings
Upstream-commit: 7f44e09797351d5a62eb044d1832bab9a40c1b98
Component: engine
2016-12-13 08:58:57 +01:00
90bc3ba4b5
Merge pull request #29267 from yuexiao-wang/fix-bulid-para
...
Update the option for docker build
Upstream-commit: 3d52c86d4c8405372445502b2592e8f63132ce99
Component: engine
2016-12-13 08:55:20 +01:00
d619a55e45
Update the option 'network' for docker build
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: cd317282c9b7d4dc68dce8df1d2f84e7a5654e72
Component: engine
2016-12-13 18:18:53 +08:00
d0d8fac761
Get rid of err altogether by just returning the assignment
...
Signed-off-by: Xianglin Gao <xlgao@zju.edu.cn >
Upstream-commit: da5d3cccc43a9ee51c8b37c751cfbc2a4e16e9ee
Component: engine
2016-12-13 14:25:57 +08:00
0bc3e1033e
return not a swarm when unlock
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 0270645c13647456834d86082470734e944fdd37
Component: engine
2016-12-13 10:38:45 +08:00
d4e814fc0e
Merge pull request #29337 from anusha-ragunathan/unmount_enable_err
...
When plugin enable fails, unmount PropagatedMount.
Upstream-commit: e9076c0f00898e7af05e667d65ecb84a6e15d9c8
Component: engine
2016-12-12 16:02:16 -08:00
645f8e7ad5
[integration-cli] skip plugin tests on non-x86
...
Due to the test plugins being architecture specific, these
tests fail to start the plugin (even though they don't fail yet)
Temporary fix until we can build architecture specific test
plugins.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: ebff8c79a3b834c555f92e673c604f14fa0afa33
Component: engine
2016-12-12 17:17:45 -05:00
1b92196a34
Merge pull request #29130 from cyphar/29097-dynamically-reload-apparmor
...
daemon: switch to 'ensure' workflow for AppArmor profiles
Upstream-commit: 96a84ed85a010c2cf6dc3308ae30e6594a519e59
Component: engine
2016-12-12 13:32:36 -08:00
5710a52064
When plugin enable fails, unmount PropagatedMount.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: cef443bddf2a185b3afa2f5c7333fd461c87ae74
Component: engine
2016-12-12 13:25:06 -08:00
e31c4556e5
Merge pull request #29230 from vieux/remove_old_media_type_plugin
...
remove old media type compat for plugins
Upstream-commit: 8de2336f078af8467900e0c6591e5732755733bc
Component: engine
2016-12-12 12:43:32 -08:00
c770ae1fee
Merge pull request #29208 from andrewhsu/validate-changelog
...
validate CHANGELOG.md is well-formed
Upstream-commit: 59ba895a0f610f5bf34ef6748540af1509910bea
Component: engine
2016-12-12 17:59:41 +01:00
b0c167868e
Merge pull request #29319 from sanimej/libn-bump
...
Vendor libnetwork @4df06c4
Upstream-commit: 4530097582fdd19a5e169d624831f7989726cf21
Component: engine
2016-12-12 11:41:57 -05:00
5cff4675b7
Merge pull request #29074 from yongtang/29044-swarm-ipam-options
...
Fix missing IPAM options in swarm network mode
Upstream-commit: 3356442d002877eedbf1df9c812ccad2cd0b8294
Component: engine
2016-12-12 17:27:01 +01:00
93f44feac0
Merge pull request #29196 from aluzzardi/service-ps-output
...
service ps: Revert output to 1.12 behavior.
Upstream-commit: 91dd29acdcd3e8e1877897e7fc6010005cc9975d
Component: engine
2016-12-12 17:20:45 +01:00
6cb48646d9
fix some broken contents links
...
Signed-off-by: Qinglan Peng <qinglanpeng@zju.edu.cn >
fix-contents-links
Signed-off-by: Qinglan Peng <qinglanpeng@zju.edu.cn >
Upstream-commit: bac792c1634724def05c5ebc93891ecd5b353a53
Component: engine
2016-12-12 21:34:37 +08:00
062e2917a6
Merge pull request #29289 from vdemeester/integration-cli-startwithbusybox
...
[integration-cli] Use *check.C in Start/Stop on Daemon struct
Upstream-commit: 8f57ac390f24698741ceb19638402a62b9320485
Component: engine
2016-12-12 11:39:26 +01:00
3b4cb955ca
Merge pull request #29318 from lixiaobing10051267/masterBuilder
...
fix some wrong vars or funcs in builder.go
Upstream-commit: 1a7c906757d3a52c7bddb7f55a08d8db75f15d26
Component: engine
2016-12-12 11:22:29 +01:00
8133996014
Merge pull request #29311 from djmaze/patch-1
...
Fix link to volume label support issue in changelog
Upstream-commit: 94a2996bde68fe89ed9934d95bf7283c4b118191
Component: engine
2016-12-12 10:58:58 +01:00
9c4a02201b
Merge pull request #29309 from ohmk/fix-description-of-docker-swarm-command
...
Fix description of docker swarm command
Upstream-commit: cc85b14d9c7b4d91e9dd1e6660c358cf66d181cf
Component: engine
2016-12-12 10:34:35 +01:00
e451072298
Merge pull request #29287 from Microsoft/jjh/fixd4w301
...
Windows: Fix crash in docker system prune
Upstream-commit: a1307aab28289cb8c05fd94011b269966a1ad742
Component: engine
2016-12-12 10:30:13 +01:00
f2aa730c1e
Merge pull request #29320 from lixiaobing10051267/masterExtendConfig
...
replace env description with args in extend config
Upstream-commit: 9f92818afe6ad123ca2a0f5bda8549dde43a48f3
Component: engine
2016-12-12 10:23:40 +01:00
fc7e504006
replace env description with args in extend config
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: abdc031aeaa757546735da0075868b87dd99ef7a
Component: engine
2016-12-12 17:24:12 +08:00
