780b0ff3be
Vendor libkv @ 1d84310
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: f9cff5e267b5e6eb9046286e8a4e43552da605eb
Component: engine
2016-11-21 14:07:51 -08:00
a4da4522af
Merge pull request #28328 from aaronlehmann/duration-opts
...
cli: Add valid suffixes for remaining duration options
Upstream-commit: 99a7289632974e4388ee09fbea2038410e713e0b
Component: engine
2016-11-21 14:03:00 -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
424f2463fd
Merge pull request #28673 from aboch/vnd
...
Vendoring libnetwork @dd0ddde
Upstream-commit: 9bd7189527a35829f4dd8e3eb630f570b466801f
Component: engine
2016-11-21 13:46:14 -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
78afb2b399
Merge pull request #28670 from cpuguy83/update_syslog_driver
...
re-vendor syslog log driver
Upstream-commit: 9326fb13890714c8003ce8105b53b75d51db54a0
Component: engine
2016-11-21 13:19:47 -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
7c7f67d5d1
Vendoring libnetwork @dd0ddde
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 948c7fdb943e89d7e08960eefb6ed030a0bab639
Component: engine
2016-11-21 11:44:58 -08:00
35302d40a0
Merge pull request #28562 from tomdee/bump-libnetwork
...
Update libnetwork version for IPv6 support
Upstream-commit: 111a95fb500194039cabf670b4cf5b62dcd9ed0e
Component: engine
2016-11-21 11:30:00 -08:00
65ee2f8e99
re-vendor syslog log driver
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 00caf03132a1bf1a2a7a389c5f23d6fc81f2bc0b
Component: engine
2016-11-21 14:24:53 -05:00
f3f3b8320e
Merge pull request #28466 from miaoyq/update-a-var-type
...
The type of 'ExportdPorts' should be 'nat.PortSet'
Upstream-commit: e349d3d330a419015e73f971acedb960be0cc24d
Component: engine
2016-11-21 20:23:10 +01:00
e3c013f930
Merge pull request #28663 from vdemeester/28633-do-not-panic-on-empty-network
...
Do not panic if network is nil
Upstream-commit: fb7e9a908b117afb1b3e173cebef4679a6407172
Component: engine
2016-11-21 10:48:03 -08:00
46e8997e76
Merge pull request #28615 from dmcgowan/update-v1-deprecation-doc
...
Update deprecation notes about v1 registry
Upstream-commit: 6cc645c938ffbe261e01a4bdafe7aabe9f0899f3
Component: engine
2016-11-21 19:16:38 +01:00
f81cd6d4f4
Merge pull request #28647 from WeiZhang555/dont-lock-client-version
...
Bugfix: set cli.manualOverride when env var not empty
Upstream-commit: 51c107b64fbaefab671b5d69a03ec9a5860459ef
Component: engine
2016-11-21 09:52:35 -08:00
6276c1c7ff
Update deprecation notes about v1 registry
...
Adds section about the hub deprecating the v1 protocol.
Adds note about intent to disable by default and remove support.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: c8f826f4077b15af30d8810f62abd517908bb712
Component: engine
2016-11-21 09:39:48 -08:00
2b291d4bab
Do not panic if network is nil
...
network is `nil` if the following case:
```
services:
foo:
image: nginx
networks:
mynetwork:
```
It's a valid compose so we should not panic.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 158388ef8d66723ec1f8ee4770d7488948234d16
Component: engine
2016-11-21 17:59:29 +01:00
c75246d4be
Merge pull request #28656 from vdemeester/update-docker-deploy-ref-doc
...
Update cli reference for docker {,stack} deploy
Upstream-commit: ca4d907851ad89545ff813b0bb854521fc3f8953
Component: engine
2016-11-21 17:46:08 +01:00
a4b2e09289
Merge pull request #28539 from nishanttotla/pin-image-digest-ux
...
Suppressing digest for docker service ls/ps
Upstream-commit: 278e01d6de56e7ffb6f47db9dfca8fdb196a9643
Component: engine
2016-11-21 14:06:37 +01:00
1524794f61
Update cli reference for docker {,stack} deploy
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 88cdfc512b0737f6dd9eb5ad207fb68f9acdf51e
Component: engine
2016-11-21 12:36:31 +01:00
65878dd980
Merge pull request #28648 from YuPengZTE/devBareURL
...
fix the mistak of url format
Upstream-commit: 5c6e649fdecb0eb12a7f077b7dbfb3fe7c851123
Component: engine
2016-11-21 11:03:43 +01:00
92c12f5ddb
Bugfix: set cli.manualOverride when env var not empty
...
If env var "DOCKER_API_VERSION" is specified by user, we'll set
`cli.manualOverride`, before this, this field is always true due to
wrong logic.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 4d54d30477f2eb0f373fd2301cf4c3ecc1434d62
Component: engine
2016-11-21 17:31:46 +08:00
86d2b2a2e1
Merge pull request #28294 from vdemeester/compose-swarm-healthcheck
...
Add support for healthcheck in compose to swarm
Upstream-commit: 3739c3bed37a3493a20bff3c9abb17561e1a732d
Component: engine
2016-11-21 10:28:37 +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
55cdbbd2d1
Bare URL used
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: 0655d5cd1f541fd13afc4c157f7e827ff2a30625
Component: engine
2016-11-21 16:30:09 +08:00
67a9711f50
Merge pull request #28644 from zhukj/daemon-config
...
close the file
Upstream-commit: 103f2e56bf753019a4013a2722f908a3ee1bc558
Component: engine
2016-11-21 13:50:26 +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
4ee658f439
Merge pull request #28637 from albers/completion-dockerd--userland-proxy-path
...
Add bash completion for `dockerd --userland-proxy-path`
Upstream-commit: 897693480652defa809c5675121f7962b72c43bd
Component: engine
2016-11-21 13:48:10 +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
71a6f392dc
Add bash completion for dockerd --userland-proxy-path
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 0d573a62f7e9b74621376cd5514462277bf341e9
Component: engine
2016-11-20 09:58:39 -08:00
46774960e2
Merge pull request #28607 from mstanleyjones/28133_iptables_false
...
Clarify that ipmasq rules are not added when iptables is false
Upstream-commit: 227af35a173c6b1d3b76f8423b8640553621924d
Component: engine
2016-11-20 17:35:31 +01:00
855a6e5ea3
Update tests to handle bug fix from libnetwork
...
Signed-off-by: Tom Denham <tom@tomdee.co.uk >
Upstream-commit: 5d983d21bf5227f32a868a0b7532ab6bfc38f28e
Component: engine
2016-11-19 16:34:56 -08:00
c0b47669c5
Update netlink library (required for libnetwork)
...
Signed-off-by: Tom Denham <tom@tomdee.co.uk >
Upstream-commit: d96baf28d4e8065212b0404c4048420c7f2c5f78
Component: engine
2016-11-19 16:12:39 -08:00
12f8b31660
Update libnetwork to latest version
...
Signed-off-by: Tom Denham <tom@tomdee.co.uk >
Upstream-commit: 5b76fe4a35adac2467658cbc5a2b26469d75f8ca
Component: engine
2016-11-19 16:12:32 -08:00
bca75d82a1
Merge pull request #28563 from darrenstahlmsft/ShutdownOnStop
...
Shutdown instead of terminate process on Windows
Upstream-commit: c8bf9336979d56f8cdb9576df981c04d06525f1e
Component: engine
2016-11-19 18:22:51 +01:00
0dc7ad5947
Merge pull request #28451 from Ghnuberath/master
...
Add HostConfig.Tmpfs to docs for container creation remote API
Upstream-commit: 2b680b15739a5128d2697c0401528d96f1de9107
Component: engine
2016-11-19 18:22:15 +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
68a4c9aae2
Merge pull request #28524 from aluzzardi/experimental-routes
...
router: Return explicit error rather than 404 for experimental.
Upstream-commit: c3fab6d47345f0d79efd88d0ea0495dd70f0e9f5
Component: engine
2016-11-18 18:49:15 -08:00
8b39397a80
Merge pull request #28561 from vieux/poc_cmd_error_unsuported
...
error on cli when trying to use experimental feature with non experimental daemon
Upstream-commit: 0337822d34d95962ec5bbbab59a0e25e932e668b
Component: engine
2016-11-18 18:47: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
59c81c21bb
Merge pull request #28613 from vieux/fix_govet
...
skip api/types/container/ (like golint) and fix one pkg
Upstream-commit: ee6f3b67961fd83bbec662ee7558e8cc47f778a9
Component: engine
2016-11-18 18:35:37 -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
6038277781
skip api/types/container/ (like golint) and fix one pkg
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 79a891efb7365e4f7d129a0142e66d2852781608
Component: engine
2016-11-18 16:33:50 -08:00
c257bd40a6
Merge pull request #28599 from aluzzardi/revendor-swarmkit
...
[master] Revendor SwarmKit to 9bca23b0de42a9ebcc71622a30d646afa1e2b564
Upstream-commit: a0866bd679f3099815d44664f7f53d099c66d426
Component: engine
2016-11-18 16:23:54 -08:00
4763d956e3
Merge pull request #28610 from vieux/fix_gofmt
...
fix gofmt in master
Upstream-commit: 697b6b504aab534bcbb7b448a695c3b64bf41793
Component: engine
2016-11-18 15:21:39 -08:00
9d6cdfc19f
fix gofmt in master
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 9f348d5625996faf7a0855b8eb52cdd4def3958e
Component: engine
2016-11-18 15:20:19 -08:00
861d75e8ee
Merge pull request #28603 from thaJeztah/flipping-hosts
...
swap position of "host" and "ip"
Upstream-commit: 8851e6ba70f8428f08a8c2cbcdad1b7532b55e43
Component: engine
2016-11-18 14:58:04 -08:00
4b5f254c7b
Clarify that ipmasq rules are not added when iptables is false
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: db3f06fd976d71a1d335278ecedf026aea6046c0
Component: engine
2016-11-18 14:25:24 -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
