Commit Graph

27974 Commits

Author SHA1 Message Date
3baf7d2e75 Add the link for service logs
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 54d38fe115e0183af7d862e54ba6e58c347e2a8d
Component: engine
2016-12-15 17:43:51 +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
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
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
9077cf8e36 Merge pull request #29305 from albers/completion-inspect-plugins
Add bash completion for `docker inspect --type plugin`
Upstream-commit: 9863470c9670d86836a901cad4c7f958e0cef371
Component: engine
2016-12-12 10:13:30 +01:00
03e1686ef2 fix some wrong vars or funcs in builder.go
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: ee8a3eee4fac23fcba9f9b95c5c627419f0b230d
Component: engine
2016-12-12 17:11:41 +08:00
49548e0e14 Add zsh completion for 'docker inspect --type=plugin' and other missing ones
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 2bdffc1fb5f66233fe23410de17a6c5e53cfe8ef
Component: engine
2016-12-12 10:09:05 +01:00
94e0a7d0c7 Use *check.C in StartWithBusybox, Start, Stop and Restart…
… to make sure it doesn't fail. It also introduce StartWithError,
StopWithError and RestartWithError in case we care about the
error (and want the error to happen).

This removes the need to check for error and make the intent more
clear : I want a deamon with busybox loaded on it — if an error occur
it should fail the test, but it's not the test code that has the
responsability to check that.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: c502fb49dc7af89adfb2a9686354aa78c2c46002
Component: engine
2016-12-12 09:46:47 +01:00
7bffefb067 Vendor libnetwork @4df06c4
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: b6b6d3ade4160bada2cff227e1da109af7a9834f
Component: engine
2016-12-12 00:29:54 -08:00
b0bd084ad6 Fix link to volume label support in changelog
Signed-off-by: Martin Honermeyer <maze@strahlungsfrei.de>
Upstream-commit: bb06e138e47ff2a7b1b3553a6337a2bb64b58907
Component: engine
2016-12-11 17:43:29 +01:00
ea1061f290 docs: fix description of docker swarm update --help
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
Upstream-commit: 2f0e00f58723cb3e063b49f564173b3768476c99
Component: engine
2016-12-11 21:25:40 +09:00
aebf5fe759 docs: fix description of docker swarm join --help
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
Upstream-commit: 77dd8474a7b4447d7c5b1d257afe1bb2f6443172
Component: engine
2016-12-11 21:21:48 +09:00
1c812611da Add bash completion for docker inspect --type plugin
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 81b4b2b5fa098756149aa3f1c44715c5ccc08860
Component: engine
2016-12-10 13:31:42 -08:00
2ce45ea956 Fix missing IPAM options in swarm network mode
This fix tries to fix the issue raised in 29044 where
the IPAM options is missing in swarm network mode
after the service is deployed. Before the service
is deployed, the IPAM options is available.

The reason for the issue is that, before service is
deployed, `network inspect` is querying the swarm and
obtained the correct information.
However, after service is deployed, swarm executor
does not pass the IPAM options to the backend (daemon).
Also after service is deployed, `network inspect` is
actually querying the local daemon for information.
At this time the network information with missing IPAM
options is returned.

This fix fixes the issue by updating the swarm network
allocator and swarm executor.

A separate PR for swarmkit will be opened.

An integration test has been added to cover the change.

This fix fixes 29044.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 4d958e99c178f7cd4196ed901c2834ae13f0f7d0
Component: engine
2016-12-10 09:29:50 -08:00
d9f7b14ab8 Merge pull request #29292 from yongtang/12092016-swarmkit-update
Update vendored swarmkit to 5a6df4b07d83e6dbd72e39e354c325dc9b91850f
Upstream-commit: b1322e3de9f2b2962e9a9d9f9c660b5c5859117b
Component: engine
2016-12-10 11:54:02 -05:00