Justin Cormack
a756c1ac65
Merge pull request #28996 from Microsoft/jjh/sqlite-remove-windows
...
Windows: Factor out sqlite
2016-12-01 13:56:11 -08:00
John Howard
3f6127b173
Windows: Factor out sqlite
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-12-01 09:38:08 -08:00
Alexander Morozov
6151ad19ad
Merge pull request #28797 from miaoyq/fix-a-err-of-logger
...
Fix a error of the function 'CopyMessage' in 'daemon/logger/logger.go'
2016-11-30 13:27:40 -08:00
Vincent Demeester
6367c67ab7
Merge pull request #28487 from cpuguy83/stack_dumps
...
Move stack dump dir to exec root
2016-11-30 20:01:29 +01:00
Anusha Ragunathan
9c2f1669a0
Merge pull request #28965 from cpuguy83/move_plugin_shutdown
...
Move plugin shutdown after layerstore shtudown
2016-11-30 10:15:49 -08:00
Doug Davis
4a0e295cd1
Merge pull request #28725 from Microsoft/jjh/builderenvcaseinsensitive
...
Windows: Builder case insensitive env
2016-11-30 08:33:29 -05:00
Vincent Demeester
768f4ce02b
Merge pull request #28899 from aaronlehmann/dont-pull-image-id
...
Don't resolve or pull images referenced by ID
2016-11-30 10:08:43 +01:00
Brian Goff
4b400ecc4d
Move plugin shutdown after layerstore shtudown
...
This ensures that graphdriver plugins can properly cleanup on daemon
exit.
Also prevents errors during shutdown when it tries to send the plugin a
`Cleanup()` request but ultimately times out since it's already been
shutdown.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-11-29 20:00:02 -05:00
Madhu Venugopal
4fae94f663
Merge pull request #28721 from dongluochen/attachable_network
...
Fix network attachable option
2016-11-29 11:04:49 -08:00
Sebastiaan van Stijn
492bc8eb45
Merge pull request #28905 from jlhawn/reject_unspecified_advertise_addr
...
Reject unspecified advertise addr on swarm init
2016-11-29 16:24:45 +01:00
Sebastiaan van Stijn
209c6a419a
Merge pull request #28935 from likel/improve-style
...
Initialize field with name
2016-11-29 15:52:13 +01:00
Ke Li
da6944ec87
Initialize field with name
...
Signed-off-by: Ke Li <kel@splunk.com>
2016-11-29 19:36:56 +08:00
Aaron Lehmann
9dba9e3248
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>
2016-11-28 17:19:29 -08:00
Dong Chen
abcb699ad1
Fix network attachable option.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-11-28 16:54:56 -08:00
Josh Hawn
eeac871946
Reject unspecified advertise addr on swarm init
...
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2016-11-28 15:44:06 -08:00
Aaron Lehmann
089842c4b4
Don't resolve or pull images referenced by ID
...
If a swarm service is created using an image ID, it's useless to try to
pull this reference or resolve it to a manifest digest. Avoid doing this
when a fully qualified image ID is given.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-11-28 13:53:52 -08:00
John Howard
49f392ff6b
Windows: Builder case insensitive env
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-28 10:30:45 -08:00
Doug Davis
937027a0cb
Merge pull request #28514 from Microsoft/jjh/workdir
...
Refix COPY file . after WORKDIR (now always created)
2016-11-28 12:58:17 -05:00
Antonio Murdaca
76a0dfaa8e
Merge pull request #28710 from miaoyq/eliminate-redundant-parameters
...
Eliminate the redundant parameter
2016-11-26 14:37:17 +01:00
Antonio Murdaca
022c13271b
Merge pull request #28829 from lixiaobing10051267/masterDaemon
...
check typos and fix in daemon directory
2016-11-26 14:33:09 +01:00
lixiaobing10051267
cf4f5b4771
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>
2016-11-26 17:23:21 +08:00
Justin Cormack
cd5c8e9c2d
Fix grammar on error message
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-25 14:58:20 +00:00
Sebastiaan van Stijn
e026f80a4d
Merge pull request #28759 from miaoyq/optimization-context-name1
...
Optimize the function 'Context.Name()' and replace 'Context.Container…
2016-11-25 13:25:17 +01:00
Justin Cormack
8602d97835
Merge pull request #28804 from bfirsh/better-service-network-overlay-error-message
...
Improve error when connecting service to network
2016-11-24 09:06:51 -08:00
Ben Firshman
70acb89fa2
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>
2016-11-24 14:43:24 +00:00
Yanqiang Miao
3b82eac65f
Fix a error of the function 'CopyMessage' in 'daemon/logger/logger.go'
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
add a test for 'CopyMessage'
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-11-24 20:08:54 +08:00
Yanqiang Miao
52fd6e4664
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>
2016-11-24 09:24:29 +08:00
Yong Tang
c90ec05175
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>
2016-11-23 13:23:07 -08:00
John Howard
286ab6d69b
COPY file . after WORKDIR (now always created)
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-23 09:56:02 -08:00
Antonio Murdaca
30b8712e93
daemon: remove not needed unmarshal
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-11-23 12:53:25 +01:00
Yanqiang Miao
58028a2919
Eliminate redundant parameters
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-11-23 09:28:13 +08:00
Tõnis Tiigi
5c1826ec4d
Merge pull request #28683 from darrenstahlmsft/SystemDLL
...
Swap usage of LazyDLL and LoadDLL to LazySystemDLL
2016-11-22 16:58:30 -08:00
Victor Vieux
22ba220e86
Merge pull request #28727 from cyli/do-not-display-secret-digest
...
Do not display the digest or size of swarm secrets [1.13]
2016-11-22 16:44:06 -08:00
Anusha Ragunathan
23ea9e45fd
Merge pull request #28601 from tiborvass/plugin-misc-fixes
...
Plugin miscellaneous fixes
2016-11-22 16:12:37 -08:00
cyli
2c0613540a
Do not display the digest or size of swarm secrets
...
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-11-22 18:13:27 -05:00
Darren Stahl
22c83c567f
Swap usage of LazyDLL and LoadDLL to LazySystemDLL.
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-11-22 14:57:11 -08:00
Tibor Vass
6547609870
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>
2016-11-22 14:32:07 -08:00
Sebastiaan van Stijn
0415525049
Merge pull request #26833 from cpuguy83/use_mounts_api_for_services
...
Use container Mounts API for Swarm containers.
2016-11-22 22:48:54 +01:00
Victor Vieux
c025d56504
Merge pull request #28691 from aluzzardi/service-logs-no-follow
...
[experimental] service logs: Support no-follow mode
2016-11-22 13:48:14 -08:00
Sebastiaan van Stijn
313502488e
Merge pull request #28506 from bfirsh/prepare-api-docs-for-swagger-docs
...
Prepare docs and Swagger definition for automatically generated API docs
2016-11-22 22:47:38 +01:00
Sebastiaan van Stijn
9d0050727d
Merge pull request #28598 from darrenstahlmsft/VmcomputeDNE
...
Ensure vmcompute.dll exists during daemon start
2016-11-22 21:31:45 +01:00
Brian Goff
821aeb6a6f
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>
2016-11-22 13:23:51 -05:00
Tibor Vass
53b9b99e5c
plugins: support for devices
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-11-22 09:54:45 -08:00
Ben Firshman
f0d55cd081
Rename Remote API to Engine API
...
Implementation of https://github.com/docker/docker/issues/28319
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 12:49:38 +00:00
Vincent Demeester
48c3df015d
Merge pull request #28651 from YuPengZTE/devMD002
...
First header should be a top level header
2016-11-22 13:11:37 +01:00
Andrea Luzzardi
c2d435e4f0
service logs: Support no-follow mode
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-21 18:02:13 -08:00
Darren Stahl
000366f1a7
Ensure vmcompute.dll exists during daemon start
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-11-21 17:40:31 -08:00
yupeng
1e65db4206
First header should be a top level header
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
2016-11-22 09:33:21 +08:00
Victor Vieux
3a6829257e
Merge pull request #28504 from runcom/fix-info-route-secopt
...
api: types: do not remove old SecurityOptions struct
2016-11-21 13:55:07 -08:00
Victor Vieux
6e4a3c4546
Merge pull request #28649 from allencloud/judge-locked-before-parsing-key
...
judge manager if locked before parsing key
2016-11-21 13:33:38 -08:00