5e08f57e6b
Merge pull request #27621 from AkihiroSuda/machine-install-bundle
...
contrib: add docker-machine-install-bundle.sh
Upstream-commit: e350d44dbe3eb808818876d115f0e56f9f303da9
Component: engine
2016-11-22 01:10:53 +01:00
dc6af48000
Merge pull request #28640 from andrewhsu/apt-mirror-arm
...
allow replacing httpredir mirror for arm
Upstream-commit: d95c174d2f85b31a3c072720dfd397d03d23fb97
Component: engine
2016-11-22 00:54:04 +01:00
39e4cf8c6c
Merge pull request #28628 from albers/completion-images-f-reference
...
Add bash completion for `docker images --filter reference`
Upstream-commit: fff1885a4bb82f351c274939ad5469e3bb1e090b
Component: engine
2016-11-22 00:52:34 +01:00
d34c5ada47
Merge pull request #28486 from vdemeester/docs-service-templating
...
Add documentation about templating support on…
Upstream-commit: 700f61841049bca424906b74d80e56d6f1c11248
Component: engine
2016-11-22 00:50:45 +01:00
629b1e5dab
Merge pull request #28664 from thaJeztah/update-service-ps-reference
...
Update service ps reference for "--no-trunc"
Upstream-commit: da4a2f16a0c5914f2bee60a8dc18f9b4975c3cf2
Component: engine
2016-11-22 00:48:03 +01:00
f460bac81d
plugins: do not try to contact disabled plugin
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 84e58e2f89b3dea30738f92edcabef4336d0cff6
Component: engine
2016-11-21 14:52:14 -08:00
4ae83fca35
plugins: support for host networking
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 99124c055ac5d145737fe432ffc2e62e320d3d96
Component: engine
2016-11-21 14:52:14 -08:00
14aacd334b
plugins: linux capabilities and device creation
...
In the plugin manifest, Capabilities has been moved to
Linux.Capabilities to avoid confusion with Interface.Types[i].Capability
A DeviceCreation boolean has also been added to the manifest. This could
be changed in the future to be specific to a major number.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 9f239281b1b02ed46f98af1eb39bc9b2165073fa
Component: engine
2016-11-21 14:52:14 -08:00
4ce562265c
Merge pull request #28677 from dnephin/remove-deploy-experimental
...
Move `docker stack` out of experimental
Upstream-commit: eac91a19d632dc82b04f19eb11f83ed1dcefb8ae
Component: engine
2016-11-21 14:33:35 -08:00
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
14018d9149
allow replacing httpredir or deb mirror in jessie
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 060196ee4cdf2d60800faef67662989d74f5c03a
Component: engine
2016-11-21 13:34:05 -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
33bbc7177a
Check for valid daemon in TearDownTest.
...
SetupTest could fail creating a Daemon object (eg, out of space when
creating daemon root dir). In such a case, TearDownTest fails when
accessing the daemon object. This commit adds the required nil check.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 5890091cc02ca75425c8635cbe4ec6c7ccd1663b
Component: engine
2016-11-21 13:29:13 -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
c21adc5da9
Add HTTP client timeout.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 83ca993c154d56e03d6f95a3f8351c48b3ed3e29
Component: engine
2016-11-21 13:11:40 -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
2beb803d6c
Move docker stack out of experimental
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 6df5baf30f96e5af3338551b9e632748d7886ead
Component: engine
2016-11-21 15:30:25 -05:00
6364691c1f
Update hcsshim
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: baac0ef67f97e007db03b4edaaa756e4a89678fc
Component: engine
2016-11-21 11:45:32 -08: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
8ca29f7629
Update service ps reference for "--no-trunc"
...
The "--no-trunc" option toggles between showing/hiding
digests.
This updates the reference to show this difference.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 90993640f0e21a45874a9efc6b6236b589945d6e
Component: engine
2016-11-21 17:39:58 +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
2bf8a1c8e2
build debian package for armhf ubuntu-xenial
...
Signed-off-by: Felix Ruess <felix.ruess@gmail.com >
Upstream-commit: 015e83a8da3ccf9f208f92d5d66e5dd159f75ad7
Component: engine
2016-11-21 12:34:20 +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
51fbd6182d
contrib: add docker-machine-install-bundle.sh
...
docker-machine-install-bundle.sh installs the bundle to Docker Machine instances.
This script helps developers to test the latest Docker with Swarm-mode enabled.
Usage:
$ docker-machine create -d some-driver dm01
..
$ docker-machine create -d some-driver dm05
$ make binary
$ contrib/docker-machine-install-bundle.sh install dm01 dm02 dm03 dm04 dm05
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: fa314aa52ee22d4f7b917236eb5a9d53d8fa0fdd
Component: engine
2016-11-21 07:13:11 +00: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
Sebastiaan van Stijn
Tibor Vass
Victor Vieux
Alessandro Boch
Alexander Morozov
Andrew Hsu
Anusha Ragunathan
Vincent Demeester
Daniel Nephin
Darren Stahl
Madhu Venugopal
Brian Goff
Derek McGowan
Sebastiaan van Stijn
Felix Ruess
Zhang Wei
allencloud
yupeng
Akihiro Suda
Lei Jitang
zhukj
Harald Albers
Tom Denham