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
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
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
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
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
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
475e43a2b7
[ppc64le] use official go 1.7.4 binaries
...
go 1.7.4 introduced official go ppc64le binaries, so use those
instead of using older versions of go and building from src.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 62ab6809bd0a654dde9c076f5a197253c66877e8
Component: engine
2016-12-08 16:18:10 -05:00
aacf384e2f
Merge pull request #28459 from dmcgowan/plugin-repository-pinning
...
Plugin repository pinning
Upstream-commit: c1a1b381f91367afa94a69649d9aa808acecc8ac
Component: engine
2016-12-08 11:28:52 -08:00
fede611756
Merge pull request #25860 from yongtang/1396-service-update-publish-rm
...
Return error for incorrect argument of `service update --publish-rm`
Upstream-commit: 032b5b21b603282e613b6d98da1c7cc2b021a924
Component: engine
2016-12-08 20:09:56 +01:00
795fc21c8b
Fix a bit typos
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 11454e1c97ed5495e77a06868a0c199d81aa96c3
Component: engine
2016-12-09 03:05:11 +08:00
53aa37ffde
Remove some unused global variables
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 58ad9177d7454893b4b5fca59e4b6b5b9e622308
Component: engine
2016-12-08 19:51:42 +01:00
15fcc0b852
Merge pull request #29142 from tophj-ibm/move-go-to-1.7.4
...
[project] bump go to go 1.7.4
Upstream-commit: 3b31de62b9dcca0def1fca939495d51504162bea
Component: engine
2016-12-08 11:48:34 -05:00
41c08096ed
Merge pull request #28924 from xlgao-zju/fix-apparmor-load-profile
...
fix apparmor load profile
Upstream-commit: 68a423304ec0a9ee590ced5ebbdb27f359cee365
Component: engine
2016-12-08 08:47:27 -08:00
dfc806e15a
Merge pull request #29092 from KingEmet/master
...
Add credential helper documentation
Upstream-commit: 4bc3b4d6aa9f41460bc02f4245ba94e0041ed141
Component: engine
2016-12-08 15:29:35 +01:00
6e67e38b7d
Merge pull request #29020 from wefine/commands_order
...
Give a order to AddCommands, for better read and maintenance.
Upstream-commit: cefda34773e6fbf68f43135f25c00d756bb8cd1a
Component: engine
2016-12-08 15:13:22 +01:00
