17f785da28
Merge pull request #28905 from jlhawn/reject_unspecified_advertise_addr
...
Reject unspecified advertise addr on swarm init
Upstream-commit: 492bc8eb457cfbf914b762df0b584f668be4a628
Component: engine
2016-11-29 16:24:45 +01:00
852751f7da
Merge pull request #28935 from likel/improve-style
...
Initialize field with name
Upstream-commit: 209c6a419aac4952bef2fedc8f941130305e6e54
Component: engine
2016-11-29 15:52:13 +01:00
bb120e07d5
Initialize field with name
...
Signed-off-by: Ke Li <kel@splunk.com >
Upstream-commit: da6944ec8747a50941c170186605c8cead517201
Component: engine
2016-11-29 19:36:56 +08:00
6eff6aab71
cluster: Refuse swarm spec not named "default"
...
If, using the API, a user submits an init request with a spec that has a
name other than "default", the engine will rename the "default" cluster
object. Some parts of swarmkit depend on having a cluster object named
"default". Reject any specs that use other names.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 9dba9e3248f8476d15242ce3ec0bf6d6d50c1a76
Component: engine
2016-11-28 17:19:29 -08:00
fc0f081a42
Reject unspecified advertise addr on swarm init
...
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: eeac8719466dbc42de7a9919d4f549863944aa19
Component: engine
2016-11-28 15:44:06 -08:00
ae5687c23e
Merge pull request #28514 from Microsoft/jjh/workdir
...
Refix COPY file . after WORKDIR (now always created)
Upstream-commit: 937027a0cbaf256ca32664d8d64d1c8eda16eaa6
Component: engine
2016-11-28 12:58:17 -05:00
89a9795d2b
Merge pull request #28710 from miaoyq/eliminate-redundant-parameters
...
Eliminate the redundant parameter
Upstream-commit: 76a0dfaa8e77fc04d97357fcb999d669b6485db2
Component: engine
2016-11-26 14:37:17 +01:00
2f9e7efdc3
Merge pull request #28829 from lixiaobing10051267/masterDaemon
...
check typos and fix in daemon directory
Upstream-commit: 022c13271b274074a6190952f1888b01c13c4a7c
Component: engine
2016-11-26 14:33:09 +01:00
115737bff2
check typos and fix in daemon directory
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: cf4f5b47710b3875767f997fc2eb3386cb0b66c0
Component: engine
2016-11-26 17:23:21 +08:00
0fab75c2a1
Fix grammar on error message
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: cd5c8e9c2dc181cd624bdb10947a19197215d730
Component: engine
2016-11-25 14:58:20 +00:00
94240c87f9
Merge pull request #28759 from miaoyq/optimization-context-name1
...
Optimize the function 'Context.Name()' and replace 'Context.Container…
Upstream-commit: e026f80a4d217eda5622c2b984fde2cdb8da0dc3
Component: engine
2016-11-25 13:25:17 +01:00
50e0ca5a47
Merge pull request #28804 from bfirsh/better-service-network-overlay-error-message
...
Improve error when connecting service to network
Upstream-commit: 8602d97835a1cb99943ca22c76d147944953f86a
Component: engine
2016-11-24 09:06:51 -08:00
64b693348d
Improve error when connecting service to network
...
The error didn't hint at how to resolve it. Google auto-suggest
also implies that people have been Googling this error.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: 70acb89fa2e889393d33664bc780cf116795f3e4
Component: engine
2016-11-24 14:43:24 +00:00
475c963e9d
Optimize the function 'Context.Name()' and replace 'Context.ContainerName' that need to remove slash with 'Context.Name()'.
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 52fd6e46645de098d803bfc510c4c24af1099def
Component: engine
2016-11-24 09:24:29 +08:00
154b3f0e4f
Restrict checkpoint name to prevent directory traversal
...
This fix tries to address the issue raised in 28769 where
checkpoint name was not checked before passing to containerd.
As a result, it was possible to use a special checkpoint name
to get outside of the container's directory.
This fix add restriction `[a-zA-Z0-9][a-zA-Z0-9_.-]+` (`RestrictedNamePattern`).
This is the same as container name restriction.
This fix fixes 28769.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: c90ec0517544e7d054d79f71f4d24d9ebbad7408
Component: engine
2016-11-23 13:23:07 -08:00
e12f9af05e
COPY file . after WORKDIR (now always created)
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 286ab6d69bb999f5fcbdfdcac50bb8d65bb50c56
Component: engine
2016-11-23 09:56:02 -08:00
905aa6bfbb
daemon: remove not needed unmarshal
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 30b8712e93819b2da77e67e16f9c7b81fd3a0cb4
Component: engine
2016-11-23 12:53:25 +01:00
9b69a300d4
Eliminate redundant parameters
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 58028a2919f1ee794a058fb3451a5145a6382b4d
Component: engine
2016-11-23 09:28:13 +08:00
167591374d
Merge pull request #28683 from darrenstahlmsft/SystemDLL
...
Swap usage of LazyDLL and LoadDLL to LazySystemDLL
Upstream-commit: 5c1826ec4de381df9f739ce0de28e37d4f734d47
Component: engine
2016-11-22 16:58:30 -08:00
e92b610690
Merge pull request #28727 from cyli/do-not-display-secret-digest
...
Do not display the digest or size of swarm secrets [1.13]
Upstream-commit: 22ba220e864d6d30ce1ed56a5461b96dbade844f
Component: engine
2016-11-22 16:44:06 -08:00
e746d79ff3
Merge pull request #28601 from tiborvass/plugin-misc-fixes
...
Plugin miscellaneous fixes
Upstream-commit: 23ea9e45fd6281e82c389e6112457a7bb70f8d89
Component: engine
2016-11-22 16:12:37 -08:00
2e3fe52bff
Do not display the digest or size of swarm secrets
...
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: 2c0613540a25d45069d142542e572bb6338e4155
Component: engine
2016-11-22 18:13:27 -05:00
4d1ac89cc0
Swap usage of LazyDLL and LoadDLL to LazySystemDLL.
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 22c83c567f379dfd475ecd35665e1cc9e5b9c314
Component: engine
2016-11-22 14:57:11 -08:00
8236c4e19a
plugins: misc fixes
...
Rename variable to reflect manifest -> config renaming
Populate Description fields when computing privileges.
Refactor/reuse code from daemon/oci_linux.go
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 6547609870b66f9dfb1894a4987c42608f856f3e
Component: engine
2016-11-22 14:32:07 -08:00
53a64e3bc4
Merge pull request #26833 from cpuguy83/use_mounts_api_for_services
...
Use container Mounts API for Swarm containers.
Upstream-commit: 04155250492c3fd75d2e789b6d2355636c8cf766
Component: engine
2016-11-22 22:48:54 +01:00
08d6a8b3d7
Merge pull request #28691 from aluzzardi/service-logs-no-follow
...
[experimental] service logs: Support no-follow mode
Upstream-commit: c025d5650433de503f0b415b7b5e120cfcd35b17
Component: engine
2016-11-22 13:48:14 -08:00
dc5227ef8f
Merge pull request #28506 from bfirsh/prepare-api-docs-for-swagger-docs
...
Prepare docs and Swagger definition for automatically generated API docs
Upstream-commit: 313502488e8809910127891d8923672baf43a742
Component: engine
2016-11-22 22:47:38 +01:00
c76f65bd98
Merge pull request #28598 from darrenstahlmsft/VmcomputeDNE
...
Ensure vmcompute.dll exists during daemon start
Upstream-commit: 9d0050727d8cc9df8654e312eb53e09c6bca1140
Component: engine
2016-11-22 21:31:45 +01:00
14f731c22d
Use container Mounts API for Swarm containers.
...
Instead of converting nicely typed service mounts into untyped `Binds`
when creating containers, use the new `Mounts` API which is a 1-1
mapping between service mounts and container mounts.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 821aeb6a6f72f070ae045cb7813759cbbaba7bda
Component: engine
2016-11-22 13:23:51 -05:00
051270420d
plugins: support for devices
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 53b9b99e5cd19d9913c56c07276a2d4d83b9befd
Component: engine
2016-11-22 09:54:45 -08:00
e5912f7d7e
Rename Remote API to Engine API
...
Implementation of https://github.com/docker/docker/issues/28319
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: f0d55cd081c6e8ad2a8222c787d54f9aae15723f
Component: engine
2016-11-22 12:49:38 +00:00
b123ea8afd
Merge pull request #28651 from YuPengZTE/devMD002
...
First header should be a top level header
Upstream-commit: 48c3df015d3118b92032b7bdbf105b5e7617720d
Component: engine
2016-11-22 13:11:37 +01:00
abd795e582
service logs: Support no-follow mode
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: c2d435e4f05d262aaa3d4d5cc2fe8965377eebdf
Component: engine
2016-11-21 18:02:13 -08:00
9d0ad3a9bc
Ensure vmcompute.dll exists during daemon start
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 000366f1a72a8fde2c25b4606821605780a55c02
Component: engine
2016-11-21 17:40:31 -08:00
163c2e9b09
First header should be a top level header
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: 1e65db4206ba89af24400fbf9047b25ec98cfd02
Component: engine
2016-11-22 09:33:21 +08:00
12ac08ce0b
Merge pull request #28504 from runcom/fix-info-route-secopt
...
api: types: do not remove old SecurityOptions struct
Upstream-commit: 3a6829257e970771a4be99783b93a803946443df
Component: engine
2016-11-21 13:55:07 -08:00
b730897ea7
Merge pull request #28649 from allencloud/judge-locked-before-parsing-key
...
judge manager if locked before parsing key
Upstream-commit: 6e4a3c4546d50558d273f8ead7b8ee42ea9f9f20
Component: engine
2016-11-21 13:33:38 -08:00
f8729bb9ff
Merge pull request #28556 from ehazlett/container-secret-store
...
Fix target reference secrets and container secret store
Upstream-commit: 05963010ee2aa363bcbd6d925918a46dba02fd7d
Component: engine
2016-11-21 21:40:01 +01:00
9fec0659ba
judge manager if locked before parsing key
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 89100c162b23791b4a64d142a11014257bf61fd0
Component: engine
2016-11-21 16:39:09 +08:00
17bacb4a03
close the file
...
Signed-off-by: zhukj <zhu.kunjia@zte.com.cn >
Upstream-commit: cf3ef262b161f1c3dd61f5689e2853c2e8ec8b70
Component: engine
2016-11-21 19:56:01 +08:00
7b9d298769
Merge pull request #28026 from ripcurld00d/fix_27772
...
Return an empty stats if the container is restarting
Upstream-commit: baa14c0e615393dc3459436052d4d7fc513d7d9a
Component: engine
2016-11-20 21:14:37 +01:00
36b43dcc24
api: types: keep info.SecurityOptions a string slice
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 514ca09426e5d023753101ffa6ac3a21b0e0efb5
Component: engine
2016-11-19 13:21:16 +01:00
40d5a75060
Merge pull request #28611 from vieux/fix_golint
...
fix a few golint errors
Upstream-commit: 96f50e9b7087bad25cb38e2985c26b509be0c403
Component: engine
2016-11-19 07:16:44 -05:00
a7e03990d9
Merge pull request #28438 from vdemeester/use-container-shell-instead-of-hardcoded
...
Use Container.Config.Shell instead of hardcoded…
Upstream-commit: f6f67891be80f40a8f8dd0e9296d56b6882ecc2f
Component: engine
2016-11-18 18:54:36 -08:00
efab471941
Merge pull request #28605 from cpuguy83/use_v2_for_graph_plugins
...
Allow graphdriver plugins to use v2
Upstream-commit: eb8fc5dcc3eecc9f645fae8194732747501398da
Component: engine
2016-11-18 18:45:34 -08:00
c148947fe6
fix a few golint errors
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 9c559e6d0b7190b4698de59e692a047beba017fd
Component: engine
2016-11-18 18:32:02 -08:00
33ea65e4f5
Allow graphdriver plugins to use v2
...
Currently the plugin initialization is too late for a loaded v2 plugin
to be usable as a graph driver.
This moves the initialization up before we create the graph driver.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 020b051dfb92edcb1e43cee77c881dd3e15481c0
Component: engine
2016-11-18 17:23:59 -05:00
71cdb489af
Merge pull request #28421 from aaronlehmann/digest-pinning-warnings
...
Return warnings from service create/update when digest pinning fails
Upstream-commit: 30d0c3899ef220e2a40f70e1e888a2d41fd7e7e8
Component: engine
2016-11-18 11:33:17 -08:00
5c4a8ff562
Merge pull request #28533 from allencloud/judge-manager-first-before-unlocking
...
judge manager before unlocking
Upstream-commit: eb0fc787e699b20d884c8d0dc23a5392e5aeb1a8
Component: engine
2016-11-18 11:27:48 -08:00
8d6fcf9749
lint fixes
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: eb036ea4db86c98d5b3f51e7d0d2424faaca0343
Component: engine
2016-11-18 13:04:08 -05:00
