Commit graph

29776 commits

Author SHA1 Message Date
Christopher Jones
ebff8c79a3
[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>
2016-12-12 17:17:45 -05:00
Victor Vieux
96a84ed85a Merge pull request #29130 from cyphar/29097-dynamically-reload-apparmor
daemon: switch to 'ensure' workflow for AppArmor profiles
2016-12-12 13:32:36 -08:00
Anusha Ragunathan
cef443bddf When plugin enable fails, unmount PropagatedMount.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-12-12 13:25:06 -08:00
Anusha Ragunathan
8de2336f07 Merge pull request #29230 from vieux/remove_old_media_type_plugin
remove old media type compat for plugins
2016-12-12 12:43:32 -08:00
Vincent Demeester
59ba895a0f Merge pull request #29208 from andrewhsu/validate-changelog
validate CHANGELOG.md is well-formed
2016-12-12 17:59:41 +01:00
Brian Goff
4530097582 Merge pull request #29319 from sanimej/libn-bump
Vendor libnetwork @4df06c4
2016-12-12 11:41:57 -05:00
Vincent Demeester
3356442d00 Merge pull request #29074 from yongtang/29044-swarm-ipam-options
Fix missing IPAM options in swarm network mode
2016-12-12 17:27:01 +01:00
Sebastiaan van Stijn
91dd29acdc Merge pull request #29196 from aluzzardi/service-ps-output
service ps: Revert output to 1.12 behavior.
2016-12-12 17:20:45 +01:00
Sebastiaan van Stijn
f1736dfa33 Merge pull request #29308 from pengqinglan/fix-contents-links
fix some broken contents links
2016-12-12 15:02:32 +01:00
Qinglan Peng
bac792c163 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>
2016-12-12 21:34:37 +08:00
Sebastiaan van Stijn
8f57ac390f Merge pull request #29289 from vdemeester/integration-cli-startwithbusybox
[integration-cli] Use *check.C in Start/Stop on Daemon struct
2016-12-12 11:39:26 +01:00
Vincent Demeester
1a7c906757 Merge pull request #29318 from lixiaobing10051267/masterBuilder
fix some wrong vars or funcs in builder.go
2016-12-12 11:22:29 +01:00
Sebastiaan van Stijn
94a2996bde Merge pull request #29311 from djmaze/patch-1
Fix link to volume label support issue in changelog
2016-12-12 10:58:58 +01:00
Vincent Demeester
cc85b14d9c Merge pull request #29309 from ohmk/fix-description-of-docker-swarm-command
Fix description of docker swarm command
2016-12-12 10:34:35 +01:00
Vincent Demeester
a1307aab28 Merge pull request #29287 from Microsoft/jjh/fixd4w301
Windows: Fix crash in docker system prune
2016-12-12 10:30:13 +01:00
Sebastiaan van Stijn
9f92818afe Merge pull request #29320 from lixiaobing10051267/masterExtendConfig
replace env description with args in extend config
2016-12-12 10:23:40 +01:00
lixiaobing10051267
abdc031aea replace env description with args in extend config
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-12-12 17:24:12 +08:00
Sebastiaan van Stijn
9863470c96 Merge pull request #29305 from albers/completion-inspect-plugins
Add bash completion for `docker inspect --type plugin`
2016-12-12 10:13:30 +01:00
Vincent Demeester
4d78a8fd0f Merge pull request #29317 from sdurrheimer/zsh-completion-inspect-types
Add zsh completion for 'docker inspect --type=plugin' and other missing ones
2016-12-12 10:11:59 +01:00
lixiaobing10051267
ee8a3eee4f fix some wrong vars or funcs in builder.go
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-12-12 17:11:41 +08:00
Steve Durrheimer
2bdffc1fb5
Add zsh completion for 'docker inspect --type=plugin' and other missing ones
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-12-12 10:09:05 +01:00
Vincent Demeester
c502fb49dc 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>
2016-12-12 09:46:47 +01:00
Santhosh Manohar
b6b6d3ade4 Vendor libnetwork @4df06c4
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-12-12 00:29:54 -08:00
Vincent Demeester
9d4aa3621f Make --publish-rm precedes --publish-add, so that add wins
`--publish-add 8081:81 --publish-add 8082:82 --publish-rm 80
--publish-rm 81/tcp --publish-rm 82/tcp` would thus result in 81 and
82 to be published.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-12-11 23:14:54 +01:00
Vincent Demeester
75bf18c9f0 Remove --port and update --publish for services to support syntaxes
Add support for simple and complex syntax to `--publish` through the
use of `PortOpt`.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-12-11 23:14:54 +01:00
Martin Honermeyer
bb06e138e4 Fix link to volume label support in changelog
Signed-off-by: Martin Honermeyer <maze@strahlungsfrei.de>
2016-12-11 17:43:29 +01:00
Kei Ohmura
2f0e00f587 docs: fix description of docker swarm update --help
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
2016-12-11 21:25:40 +09:00
Kei Ohmura
77dd8474a7 docs: fix description of docker swarm join --help
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
2016-12-11 21:21:48 +09:00
Harald Albers
81b4b2b5fa Add bash completion for docker inspect --type plugin
Signed-off-by: Harald Albers <github@albersweb.de>
2016-12-10 13:31:42 -08:00
Yong Tang
4d958e99c1 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>
2016-12-10 09:29:50 -08:00
Brian Goff
b1322e3de9 Merge pull request #29292 from yongtang/12092016-swarmkit-update
Update vendored swarmkit to 5a6df4b07d83e6dbd72e39e354c325dc9b91850f
2016-12-10 11:54:02 -05:00
Vincent Demeester
f7897afaff Merge pull request #29173 from lalyos/patch-2
Note about potential plugin issue when upgrading
2016-12-10 16:16:50 +01:00
Brian Goff
f29bbd16f5 Refcount graphdriver plugins properly
Adds 2 new methods to v2 plugin `Acquire` and `Release` which allow
refcounting directly at the plugin level instead of just the store.
Since a graphdriver is initialized exactly once, and is really managed
by a separate object, it didn't really seem right to call
`getter.Get()` to refcount graphdriver plugins.
On shutdown it was particularly weird where we'd either need to keep a
driver reference in daemon, or keep a reference to the pluggin getter in
the layer store, and even then still store extra details on if the
graphdriver is a plugin or not.

Instead the plugin proxy itself will handle calling the neccessary
refcounting methods directly on the plugin object.

Also adds a new interface in `plugingetter` to account for these new
functions which are not going to be implemented by v1 plugins.

Changes terms `plugingetter.CREATE` and `plugingetter.REMOVE` to
`ACQUIRE` and `RELEASE` respectively, which seems to be better
adjectives for what we're doing.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-12-09 19:46:28 -05:00
Yong Tang
3c1c992271 Revendor swarmkit to 5a6df4b07d83e6dbd72e39e354c325dc9b91850f
This fix updates swarmkit to 5a6df4b07d83e6dbd72e39e354c325dc9b91850f.

This fix is needed by #29074 (docker PR) and is related to
docker/swarmkit#1789 (swarmkit PR) and #29044

This fix may be needed for 1.13.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-12-09 16:28:51 -08:00
Anusha Ragunathan
001cbc4518 Merge pull request #29210 from vdemeester/integration-cli-extract-daemon
[integration-tests] extract daemon to its own package
2016-12-09 15:23:46 -08:00
Misty Stanley-Jones
66cbb5a552 Edits to plugin upgrade warning
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-12-09 14:50:36 -08:00
Victor Vieux
ab65ac6bc4 Merge pull request #29233 from aaronlehmann/vendor-swarmkit-5fe1f720
Update vendored swarmkit to 5fe1f720
2016-12-09 14:49:14 -08:00
Victor Vieux
8db25833b9 Merge pull request #29264 from andrewhsu/revert-pr-29081
Revert PR 29081 add selinux policy for centos-7
2016-12-09 14:48:52 -08:00
John Howard
30b8f08443 Windows: Prompt fix
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-12-09 14:27:53 -08:00
John Howard
e5900ee9bf Windows: Fix crash in docker system prune
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-12-09 14:23:25 -08:00
Sebastiaan van Stijn
7caf77ac18 Merge pull request #23480 from thaJeztah/remove-unsupported-distros
Remove unsupported distros from install script
2016-12-09 22:38:18 +01:00
Vincent Demeester
f4a34a1f06 Remove check.C field from daemon and Use errors package
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-12-09 22:26:42 +01:00
Vincent Demeester
48de91a33f Extract daemon to its own package
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-12-09 22:26:42 +01:00
Anusha Ragunathan
0a072e93df Merge pull request #26398 from tiborvass/plugin-fixes
plugins: container-rootfs-relative paths
2016-12-09 12:48:59 -08:00
Anusha Ragunathan
86a0de7fa9 Merge pull request #29281 from anusha-ragunathan/fix_race
Fix race in setting plugin refcounts.
2016-12-09 12:47:39 -08:00
Vincent Demeester
f2533c0266 Merge pull request #29275 from cpuguy83/set_inspect_type_emptyfs
Set inspect type in ensure-emptyfs
2016-12-09 21:40:58 +01:00
Lajos Papp
acd847cd56 Note about potential plugin issue when upgrading
Fixes: #29172
Fixes: https://github.com/docker/for-mac/issues/1000

Signed-off-by: Lajos Papp <lalyos@yahoo.com>
Signed-off-by: lalyos <lalyos@yahoo.com>
2016-12-09 19:32:28 +01:00
Tibor Vass
c54b717caf plugins: container-rootfs-relative paths
Legacy plugins expect host-relative paths (such as for Volume.Mount).
However, a containerized plugin cannot respond with a host-relative
path. Therefore, this commit modifies new volume plugins' paths in Mount
and List to prepend the container's rootfs path.

This introduces a new PropagatedMount field in the Plugin Config.
When it is set for volume plugins, RootfsPropagation is set to rshared
and the path specified by PropagatedMount is bind-mounted with rshared
prior to launching the container. This is so that the daemon code can
access the paths returned by the plugin from the host mount namespace.

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-12-09 10:16:24 -08:00
allencloud
19654fd71e add missing status code 403 for services/create in docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-12-10 01:54:51 +08:00
Anusha Ragunathan
4c088d1e2e Fix race in setting plugin refcounts.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-12-09 09:34:30 -08:00