4ab9943ca0
Fixing servicing bug by always specifying LayerFolderPath
...
During the recent OCI changes, I mistakenly thought LayerFolderPath is only needed for Windows Server containers (isolation=process) and not for Hyper-V Containers, but it turns out it is also required for servicing containers used to finish installing updates. Since the servicing containers need to reuse the container's create options, this change makes it so that LayerFolderPath is always filled in for all containers as part of constructing the create options.
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: 78540d0d181d581342b0a2750786ae91e6ed9f91
Component: engine
2016-10-04 15:29:30 -07:00
6435f4aeaf
Merge pull request #27148 from anusha-ragunathan/chg_import_path
...
Add plugingetter to pkg.
Upstream-commit: e097c2a938c76734240d90ddc15a83ad3699d3a5
Component: engine
2016-10-04 15:17:08 -04:00
7ec53d01f4
Add plugingetter to pkg.
...
plugingetter is indepedent of docker/docker packages, so it can be
moved to pkg. This is also necessary for authorization plugins (part of
pkg) to use pluginv2. The original path at plugin/getter will be
eventually removed, when external repos (eg. libnetwork) update their
import paths.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: d599d53db27f4a24b18f51464c39707eae383c7e
Component: engine
2016-10-04 12:03:29 -07:00
19c07b3df2
Merge pull request #26989 from aboch/none
...
Respect --bridge=none
Upstream-commit: 694ba71e365c6b9aa7472a9ef29bbde3cba6dce2
Component: engine
2016-10-04 16:25:39 +02:00
6d8d7fa57b
Merge pull request #27136 from allencloud/add-lock-in-libcontainerd
...
add lock in libcontainerd client AddProcess of Windows
Upstream-commit: 5e072a25f80f13028fdb86df4179a8ee60cbde90
Component: engine
2016-10-04 09:29:59 -04:00
43c9d470cf
add lock in libcontainerd client AddProcess of Windows
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 5143be0ccf70c7cb2acc2aa39fd7ec47450e5daa
Component: engine
2016-10-04 10:29:21 +08:00
c99a6c9099
Merge pull request #26860 from anusha-ragunathan/nw-pv2
...
Make libnetwork use pluginv2.
Upstream-commit: 0cc7f0185f59f9271b7b783b776dac74347e8f51
Component: engine
2016-10-03 17:12:16 -07:00
b81765ad80
Merge pull request #27128 from anusha-ragunathan/plugin-shutdown
...
Shutdown plugins after containers.
Upstream-commit: 671d01aabf7ebeb1589c5cbdabb769ac09da52b9
Component: engine
2016-10-03 17:08:22 -07:00
881be51ddf
Merge pull request #27121 from LK4D4/fix_import
...
volume/local: fix import path
Upstream-commit: f60727d1853299216b573ca7e2975020a74e4055
Component: engine
2016-10-03 16:48:20 -07:00
b99e1dad7a
Merge pull request #27126 from mlaventure/fix-tgz
...
Remove amd64 assumption in release.sh, cross and tgz scripts
Upstream-commit: bd57e6d25c2c9d41a6cf2c9931606f58bb66a07d
Component: engine
2016-10-03 16:03:00 -07:00
a73e97a2f5
Merge pull request #27127 from vieux/revert_wrong_doc
...
Revert "fix API doc service delete"
Upstream-commit: 0892a737d1a655a97ce52f424d90cab35854742a
Component: engine
2016-10-03 16:02:08 -07:00
543881c701
Shutdown plugins after containers.
...
Fixes #26278
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: ed6e30767e27537ce342baa17659d983a76c5b7e
Component: engine
2016-10-03 15:52:44 -07:00
6885c18aa4
Remove amd64 assumption in release.sh, cross and tgz scripts
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 61335bcb03ac60385bc19b6e1346b34cd168f7de
Component: engine
2016-10-03 15:46:42 -07:00
a5f310019c
volume/local: fix import path
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 5af8cfd3b16b6bc1754537fb5424365839ad2fc4
Component: engine
2016-10-03 12:13:56 -07:00
33a6443775
Merge pull request #27119 from vieux/fix_doc_delete_service
...
fix API doc service delete
Upstream-commit: 94cd7ed72d8554862b6f2f07ed4f5ee8a4dd3ede
Component: engine
2016-10-03 12:03:45 -07:00
f4148f6920
Merge pull request #26960 from allencloud/make-remove-cloudprovider-network-return-204
...
make remove cloudprovider network return 204
Upstream-commit: 8b416fb0256c619c0ea6ac5c8efd94187f446cdd
Component: engine
2016-10-03 14:46:11 -04:00
674e83fb8c
Merge pull request #27085 from alexchenfeng/master
...
add check flag for CONFIG_NETFILTER_XT_MATCH_IPVS CONFIG_IP_VS_NFCT C…
Upstream-commit: ce64a9bffd8f0411bbd34f6ea690b7e129898b02
Component: engine
2016-10-03 14:23:07 -04:00
b172aee005
Merge pull request #27078 from darrenstahlmsft/InteractiveRestartTest
...
Increase timeout in TestRunInteractiveWithRestartPolicy
Upstream-commit: e22d4b9654620da086a6e90b95427ba6a7ef4422
Component: engine
2016-10-03 11:22:33 -07:00
bc1c43e903
Respect --bridge=none
...
- Do not create the default "bridge" network
- Get rid of the docker0 bridge
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: a0af884d3a499460bdb8b41bc7cd61b1a56e6d22
Component: engine
2016-10-03 11:08:34 -07:00
a56e5f9c6c
Vendor docker/swarmkit changes.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 009f74135123c785783349358d5ad69aa0992305
Component: engine
2016-10-03 10:59:38 -07:00
8ca73d18af
Initialize libnetwork and IPAMDriver with pluginstore.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: a00940f02c2699c091ebffb47f4c2d7f14f284d9
Component: engine
2016-10-03 10:40:05 -07:00
3b8c0feef0
Vendor in docker/libnetwork.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 2b0f0d0d711cf64233d984a02287c2167ce2d6c3
Component: engine
2016-10-03 10:40:05 -07:00
4c9f39efcc
Merge pull request #26967 from AkihiroSuda/rename-tests
...
[nit] integration-cli: obey Go's naming convention
Upstream-commit: 7e29b33546098816d5dbc1fc429e868f02b69e44
Component: engine
2016-10-03 09:52:04 -04:00
a3df8d8c65
Merge pull request #27094 from allencloud/add-lock-in-libcontainerd-client
...
add lock in libcontainerd client AddProcess
Upstream-commit: 675e6224329dd46a8e5e52d7035da88fc97def94
Component: engine
2016-10-02 16:50:41 -07:00
84ce717a7a
Merge pull request #27097 from albers/completion-node-ps-multiple-nodes
...
Add support for multiple nodes in bash completion for `docker node ps`
Upstream-commit: 367d5b02322b8211c18b95faba1527ec591045f5
Component: engine
2016-10-02 14:38:46 +02:00
9ec0f309fb
Merge pull request #27096 from albers/completion-daemon--init-path
...
Add bash completion for `dockerd --init-path`
Upstream-commit: eca5ff194feca36acb6f6958f27a92eb74d86716
Component: engine
2016-10-02 14:37:13 +02:00
3d025590b1
Merge pull request #27060 from yongtang/27021-inspect-show-env
...
Disable HTML escaping for JSON strings in `docker inspect`
Upstream-commit: 420e22fad4dcdff3b8025666216cc85fc9358f69
Component: engine
2016-10-02 14:32:56 +02:00
9f3299176f
Add support for multiple nodes in bash completion for docker node ps
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 9aeb69a0690d0d26bd3dea344f675b22f9ceda19
Component: engine
2016-10-02 05:18:32 -07:00
22e87ff2f2
Add bash completion for dockerd --init-path
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: d710a3e1f8d1ffeeb141a08806e18623a36d2248
Component: engine
2016-10-02 05:10:00 -07:00
455b5fdd43
add lock in libcontainerd client AddProcess
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 278273bc1699873304240a6eca342b54051e2f23
Component: engine
2016-10-02 00:36:25 +08:00
9a44b50701
make remove network return 204
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: ea07ef7a7c3a221d6167cc2e36806ed9615ac973
Component: engine
2016-10-01 19:50:40 +08:00
8585d1a8a3
Merge pull request #26564 from miminar/prevent-blob-uploads
...
Avoid unnecessary blob uploads
Upstream-commit: 762556c705e96749bba34b7e32a7f464186ccd41
Component: engine
2016-10-01 12:53:10 +02:00
06272d8590
Revert "fix API doc service delete"
...
This reverts commit a12120e78c5852d5571da38e7b9e4cd49f41edc3.
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: bd996414667785fb6f69348038f973cfce20a2bc
Component: engine
2016-10-01 02:12:41 -07:00
51ec6bcf96
Merge pull request #27062 from yank1/Inconsistency-"on_failure"-vs-"on-failure"
...
Fix conversion of restart-policy from GRPC
Upstream-commit: 6e8a2cd29113896acfc3f97a43dd27f751f2f519
Component: engine
2016-10-01 10:39:00 +02:00
b0dfc9bb7f
fix API doc service delete
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: a12120e78c5852d5571da38e7b9e4cd49f41edc3
Component: engine
2016-09-30 22:31:40 -07:00
dcd98584e4
Merge pull request #26108 from mlaventure/data-mngt
...
New Data Management commands
Upstream-commit: 86de7c000f5d854051369754ad1769194e8dd5e1
Component: engine
2016-10-01 03:17:18 +00:00
707bb1cca6
add check flag for CONFIG_NETFILTER_XT_MATCH_IPVS CONFIG_IP_VS_NFCT CONFIG_IP_VS_RR in contrib/check-config.sh
...
Signed-off-by: alexchen <alexchenunix@gmail.com >
Upstream-commit: 4c74469d30a71c53cc6b309a3c0048191b1ac008
Component: engine
2016-10-01 09:50:17 +08:00
508d829cee
Merge pull request #26968 from darrenstahlmsft/TestEventsFix
...
Limit conccurent container creates in TestEventsLimit to 8
Upstream-commit: 18338427ed4573a1b4bcf57654dac59e6da6c215
Component: engine
2016-09-30 16:29:01 -07:00
d14cd42778
Increase timeout in TestRunInteractiveWithRestartPolicy
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 6eac29490f9bffcb21525f9fcba389ac3dc89e85
Component: engine
2016-09-30 15:30:18 -07:00
859a595848
Merge pull request #27075 from tonistiigi/copy-error-reporting
...
Fix error reporting in `CopyFileWithTar`
Upstream-commit: 6de38ebc4dfbea0f4a805a6baee109b4c830c272
Component: engine
2016-09-30 18:14:13 -04:00
4136664b0a
Limit conccurent container creates in TestEventsLimit to 8
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 728a26519051561da7d0310911831955fa42b1d5
Component: engine
2016-09-30 14:44:05 -07:00
465b6ed553
Merge pull request #27049 from dnephin/fix-label-flag-type
...
Use ListOpt for build labels
Upstream-commit: 1b944a3025ba1eb1bfb86ed6393b7fe33de40eb6
Component: engine
2016-09-30 23:40:08 +02:00
881a82ffc0
Add documentation for container, volume, image and system prune subcommands
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 913e5cb77bcb7134be2e9b1aaa7e63627285e676
Component: engine
2016-09-30 14:35:23 -07:00
1de35edb56
Document new /system/df and /{containers,volumes,images}/prune API EndPoints
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: a860d5db451f4cab4e49a831139ddcf554de52a2
Component: engine
2016-09-30 14:35:23 -07:00
27aa54380b
Add new df subcomand to the system command
...
This command display the state of the data usage of the docker daemon.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: b650a7bd27dcdbb4cddbfdc2cf62f41b5a8e8652
Component: engine
2016-09-30 14:35:23 -07:00
5f25d3f4ea
Fix error reporting in CopyFileWithTar
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 57e12037ac8f8eb48cc05979c3030853d011dfea
Component: engine
2016-09-30 11:46:37 -07:00
7f3def0be4
Merge pull request #27072 from Microsoft/jjh/fix26843
...
Windows: Don't resolve volume dest
Upstream-commit: d89fb40e1ce1373e3b188b9a817fcf9a5f37cd13
Component: engine
2016-09-30 14:46:07 -04:00
f44fc82a36
Merge pull request #26961 from Microsoft/jjh/oci
...
Windows: OCI runtime spec compliance
Upstream-commit: 97660c6ec55f45416cb2b2d4c116267864b62b65
Component: engine
2016-09-30 10:13:57 -07:00
1e2592ec36
Merge pull request #26997 from tonistiigi/exec-env
...
Fix missing hostname and links in exec env
Upstream-commit: 6eef2b2ada0ee7657b3821af055d8fb337d682f4
Component: engine
2016-09-30 09:51:02 -07:00
e59d7b9406
Windows: Don't resolve volume dest
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3838c314add208a57003611a6963784435863330
Component: engine
2016-09-30 09:40:15 -07:00
