Commit Graph

31631 Commits

Author SHA1 Message Date
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
26f0ec1d95 Merge pull request #29317 from sdurrheimer/zsh-completion-inspect-types
Add zsh completion for 'docker inspect --type=plugin' and other missing ones
Upstream-commit: 4d78a8fd0fd9e45f38135163473b72a49d65f136
Component: engine
2016-12-12 10:11:59 +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
57d5fc9bfa Move templates to pkg/templates
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 04f7a03359ac009ad2cd548fa93124a66e880ae5
Component: engine
2016-12-12 09:34:03 +01:00
38517bb088 Move debug functions to cli/debug package
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: ce375503477c82a76ce8530e73655fbbf5046834
Component: engine
2016-12-12 09:33:58 +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
90c004590f Move process functions to pkg/system
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8c1ac816657a1371597c4b2d1a758bee0114e0d7
Component: engine
2016-12-12 09:28:41 +01:00
74e9315982 Move utils.TestDirectory to pkg/testutil/tempfile
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 0ab9320ab28afbf62a8b81e5f151db908897df86
Component: engine
2016-12-12 09:28:32 +01:00
314935f565 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>
Upstream-commit: 9d4aa3621f226f4167fb7c3585dfe1c37c40472e
Component: engine
2016-12-11 23:14:54 +01:00
97f2808afa 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>
Upstream-commit: 75bf18c9f01d050e5fccab98fb671306c7c5f6d2
Component: engine
2016-12-11 23:14:54 +01: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
8c1239db9a Merge pull request #29173 from lalyos/patch-2
Note about potential plugin issue when upgrading
Upstream-commit: f7897afaff0494dd8157e96a92fbfc59b0dbd1d9
Component: engine
2016-12-10 16:16:50 +01:00
6dcc37964b 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>
Upstream-commit: f29bbd16f5d2bb82d815ea59f8ef85fe59384c89
Component: engine
2016-12-09 19:46:28 -05:00
996e12afa9 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>
Upstream-commit: 3c1c992271800b3ba948482d2e8c2c41d765a906
Component: engine
2016-12-09 16:28:51 -08:00
28400e4236 Merge pull request #29210 from vdemeester/integration-cli-extract-daemon
[integration-tests] extract daemon to its own package
Upstream-commit: 001cbc4518a3656df0cfda81da5042911a7eed2f
Component: engine
2016-12-09 15:23:46 -08:00
8c3b9d83cb Edits to plugin upgrade warning
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 66cbb5a552e21cc373e34771f6c97bb3e95f4fba
Component: engine
2016-12-09 14:50:36 -08:00
21831612fd Merge pull request #29233 from aaronlehmann/vendor-swarmkit-5fe1f720
Update vendored swarmkit to 5fe1f720
Upstream-commit: ab65ac6bc4fad18321d7759ca309b0296aa1120d
Component: engine
2016-12-09 14:49:14 -08:00
6def112890 Merge pull request #29264 from andrewhsu/revert-pr-29081
Revert PR 29081 add selinux policy for centos-7
Upstream-commit: 8db25833b9ecd371300f129041f680efcdeb2ab2
Component: engine
2016-12-09 14:48:52 -08:00
a586c34f99 Windows: Prompt fix
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 30b8f084436a2a1d5e8523fcd2c5ea64cc805224
Component: engine
2016-12-09 14:27:53 -08:00
4c8ed1c0c8 Windows: Fix crash in docker system prune
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e5900ee9bf0071c6a3ebaf813f82d5345c25d8f0
Component: engine
2016-12-09 14:23:25 -08:00
09e95b9a9f Merge pull request #23480 from thaJeztah/remove-unsupported-distros
Remove unsupported distros from install script
Upstream-commit: 7caf77ac185b9ae16e4d0756faf01b360c0816af
Component: engine
2016-12-09 22:38:18 +01:00
7e5a985603 Remove check.C field from daemon and Use errors package
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: f4a34a1f065e26bbf1657cf857f02e9bc9a66b47
Component: engine
2016-12-09 22:26:42 +01:00
71651385ac Extract daemon to its own package
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 48de91a33f097d4c20515088af1f5bcb9a98c5c9
Component: engine
2016-12-09 22:26:42 +01:00
6b1a2692bb Merge pull request #26398 from tiborvass/plugin-fixes
plugins: container-rootfs-relative paths
Upstream-commit: 0a072e93df6ad10e37bbf0b1f540fff7b7581a75
Component: engine
2016-12-09 12:48:59 -08:00
482b3af442 Merge pull request #29281 from anusha-ragunathan/fix_race
Fix race in setting plugin refcounts.
Upstream-commit: 86a0de7fa9fe34d29cffc8fcffe0b81b0db78a87
Component: engine
2016-12-09 12:47:39 -08:00
2c58cb78a9 Merge pull request #29275 from cpuguy83/set_inspect_type_emptyfs
Set inspect type in ensure-emptyfs
Upstream-commit: f2533c0266f5447dfed9981f2c67c334900afa79
Component: engine
2016-12-09 21:40:58 +01:00
3aebaeb54f 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>
Upstream-commit: acd847cd569d35b63cb00446badf9d0ea83e214c
Component: engine
2016-12-09 19:32:28 +01:00
656f60dc73 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>
Upstream-commit: c54b717caf1a55e525ce180bfcb42addd59c6633
Component: engine
2016-12-09 10:16:24 -08:00
1201f538ea add missing status code 403 for services/create in docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 19654fd71ec5b9b075863f4623fdb80a955f5187
Component: engine
2016-12-10 01:54:51 +08:00
955998db83 Fix race in setting plugin refcounts.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 4c088d1e2ebfcc384a365734017988f4fd1c4605
Component: engine
2016-12-09 09:34:30 -08:00
5b4ba9313b Merge pull request #28949 from yongtang/28717-docker-plugin-create
Use GetByName to check for collision before create any context in plugin creation
Upstream-commit: 9d884986f5c001cacb60aa3c50036575ed2dd22d
Component: engine
2016-12-09 09:12:08 -08:00
4af91ff190 Merge pull request #29231 from Microsoft/jjh/dcocheck
Windows: make.ps1 fix DCO check
Upstream-commit: b8e15537656ce64db32b0972ce0c8adbce405bae
Component: engine
2016-12-09 17:07:31 +01:00
ae7e2b46cd Merge pull request #28976 from miaoyq/remove-a-redundant-func-and-fix-some-typos
Remove a redundant funtion and fix some typos
Upstream-commit: b00f1c8623722e45eba420e6d091a24135b0bc0c
Component: engine
2016-12-09 08:44:05 -05:00
45f211246a Set inspect type in ensure-emptyfs
This keeps the test daemon logs from being flooded with calls to lookup
emptyfs for other types.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 71ca76e8f20c33d313d2d0dffba0eddf39e69f9e
Component: engine
2016-12-09 08:26:05 -05:00
7272f6fdfe Merge pull request #29245 from pengqinglan/doc-deprecated
fix some version information
Upstream-commit: 98e4a7edb6d8a9a60a510327d4cb1e0da1edebcc
Component: engine
2016-12-09 10:25:50 +01:00
d377a823f5 Merge pull request #29244 from yuexiao-wang/fix-typos-eg
Fix a bit typos
Upstream-commit: d1515a5264e7872bfe11543b2b23b4f1eac23f68
Component: engine
2016-12-09 16:03:35 +09:00
155f5e9a56 Revert "add selinux policy for centos-7"
This reverts commit e0852bec9613622a4a182d5170a59655c7cf1c6a.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 387b95216b93396fe55ee01e1a73ea0e68eaa297
Component: engine
2016-12-08 16:27:48 -08:00
c592dbea5b Revert "add extra docker.te lines from rhel7.3 docker.spec"
This reverts commit 09e68fdd527e8e41cc618a0b3e8700528671613c.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 28cfdc62bd510bb1409f54fed140961466348dda
Component: engine
2016-12-08 16:27:36 -08:00
20a5fc751f Revert "get rhel7.3 selinux-policy-devel pkg for centos-7"
This reverts commit bfe5cab13bf0c83624fde0ab74f223bfa15d04c2.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 793be849c8bd13a88cc2b370141cc8c9b1c3f77b
Component: engine
2016-12-08 16:27:23 -08:00
2274bcf15c Merge pull request #29256 from tophj-ibm/ppc64le-move-to-go-bin
[ppc64le] use official go 1.7.4 binaries
Upstream-commit: 9aa0c9a2142af249527aa301ddd7e21bc308c624
Component: engine
2016-12-08 15:59:31 -08:00
913e79bf2c Merge pull request #29224 from vdemeester/check-no-errors
Use check in params so we don't ignore errors
Upstream-commit: 7ea31b4034a52ffc67067222e24265d19bcff6ba
Component: engine
2016-12-09 00:26:20 +01:00
fbe4468efc ppc64le rpmbuild
Add support for 'make rpm' on ppc64le. Currently only fedora 24.

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
Upstream-commit: 42969d44fc9a9905b32a4fc1d5facdb64da3e4ab
Component: engine
2016-12-08 17:16:16 -05:00