Andrea Luzzardi
43e6479fd4
service logs: Support no-follow mode
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
(cherry picked from commit c2d435e4f0
2016-11-22 16:18:09 -08:00
Darren Stahl
af08f44640
Revendor go-winio to v0.3.7
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
(cherry picked from commit 873a26697d
2016-11-22 16:17:33 -08:00
Tibor Vass
faab09c1aa
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>
(cherry picked from commit 6547609870
2016-11-22 16:16:39 -08:00
Tibor Vass
561f2b27cb
plugins: support for devices
...
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 53b9b99e5c
2016-11-22 16:16:33 -08:00
Tibor Vass
63277b0aff
vendor go-connections to error out if unix socket path is too long
...
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit e2e7ab655f
2016-11-22 16:16:24 -08:00
Tibor Vass
8f66c5e731
plugins: fix some tests
...
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit a08ffa0e93
2016-11-22 16:16:16 -08:00
Tibor Vass
a275ca2093
plugins: support for host networking
...
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 99124c055a
2016-11-22 16:16:10 -08:00
Tibor Vass
c28c63472a
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>
(cherry picked from commit 9f239281b1
2016-11-22 16:16:04 -08:00
Tibor Vass
fb3c3d7eea
plugins: do not try to contact disabled plugin
...
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 84e58e2f89
2016-11-22 16:15:58 -08:00
Darren Stahl
40a56f29e2
Ensure vmcompute.dll exists during daemon start
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
(cherry picked from commit 000366f1a7
2016-11-22 16:15:19 -08:00
Brian Goff
9e35dea991
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>
(cherry picked from commit 821aeb6a6f
2016-11-22 16:13:28 -08:00
Harald Albers
24628fd7a0
Fix typo in docs (Copmose)
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 2e12055687
2016-11-22 11:27:57 -08:00
Vincent Demeester
9302b0f59c
Update aanand/compose-file to a3e58764f50597b6217fec07e9bff7225c4a1719
...
This fixes services networks list to be ignored when loading.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 01b70a95c9
2016-11-22 11:27:28 -08:00
Andrew Hsu
3168635120
skip solaris and allow dry run control points
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit f60541069c
2016-11-22 11:27:01 -08:00
Steve Durrheimer
f46b2fd604
Add zsh completion for 'docker image ls --filter reference'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit 15134b8d36
2016-11-22 11:26:33 -08:00
Steve Durrheimer
702b03b6fc
Add zsh completion for 'dockerd --userland-proxy-path'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit 97e1892922
2016-11-22 11:26:03 -08:00
Tonis Tiigi
3f0aa9bceb
Fix race on sending stdin close event
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 4e262f6387
2016-11-22 11:25:33 -08:00
Kenfe-Mickael Laventure
3ab3f953d7
Add generate.sh for armhf deb Dockerfiles
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 3b3cf87478
2016-11-22 11:25:01 -08:00
Kenfe-Mickael Laventure
bab6bf1d5e
Add support for armhf ubuntu-yakkety deb
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit b118056241
2016-11-22 11:24:55 -08:00
Darren Stahl
8ebbeda5a8
Update hcsshim
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
(cherry picked from commit baac0ef67f
2016-11-22 11:24:21 -08:00
Reficul
ca51b2bf2c
fix incorrect ErrConnectFailed comparison
...
Signed-off-by: Reficul <xuzhenglun@gmail.com>
(cherry picked from commit d5dc9b8b1f
2016-11-22 11:23:49 -08:00
Anusha Ragunathan
0403addc5f
Add HTTP client timeout.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
(cherry picked from commit 83ca993c15
2016-11-22 11:23:20 -08:00
allencloud
abc0eea899
update secret create url for consistency
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit 86d7682843
2016-11-22 11:22:39 -08:00
Brian Goff
b4c0b07d89
Handle run --rm against older daemons on the cli
...
For previous versions of Docker, `--rm` was handled client side, as such
there was no support in the daemon for it.
Now it is handled daemon side, but we still need to handle the case of a
newer client talking to an older daemon.
Falls back to client-side removal when the daemon does not support it.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit f4bb8c51de
2016-11-22 11:22:08 -08:00
Harald Albers
2d5f5287c3
Add bash completion for docker build --network
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit d48e70843f
2016-11-22 11:21:36 -08:00
Felix Ruess
41b92e6f36
build debian package for armhf ubuntu-xenial
...
Signed-off-by: Felix Ruess <felix.ruess@gmail.com>
(cherry picked from commit 015e83a8da
2016-11-22 11:21:10 -08:00
Qiang Huang
8079cc8147
Add make deb support for aarch64
...
Fixes : #27045
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
(cherry picked from commit a532ff8cc3
2016-11-22 11:20:32 -08:00
Andrew Hsu
e285a304db
allow replacing httpredir or deb mirror in jessie
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit 060196ee4c
2016-11-21 17:29:22 -08:00
Harald Albers
6f03b32968
Add bash completion for docker images --filter reference
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit e84d62f6cb
2016-11-21 17:28:46 -08:00
Vincent Demeester
2fb6810841
Add documentation about templating support on…
...
… services creation/update.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 4571ad05db
2016-11-21 17:28:06 -08:00
Sebastiaan van Stijn
7e2522ec9f
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>
(cherry picked from commit 90993640f0
2016-11-21 17:26:38 -08:00
Daniel Nephin
95398c33cc
Move docker stack out of experimental
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 6df5baf30f
2016-11-21 14:47:24 -08:00
Brian Goff
fcb64b6e08
re-vendor syslog log driver
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 00caf03132
2016-11-21 14:46:48 -08:00
allencloud
2ecc8cd4bd
judge manager if locked before parsing key
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit 89100c162b
2016-11-21 14:46:22 -08:00
Evan Hazlett
bdc378e781
lint fixes
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
(cherry picked from commit eb036ea4db
2016-11-21 14:45:45 -08:00
Evan Hazlett
01aab8baa3
do not force target type for secret references
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
use secret store interface instead of embedded secret data into container
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
(cherry picked from commit bebd472e40
2016-11-21 14:45:39 -08:00
Antonio Murdaca
0a5732d1cf
api: types: keep info.SecurityOptions a string slice
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit 514ca09426
2016-11-21 14:45:05 -08:00
Aaron Lehmann
2737519f9a
cli: Add valid suffixes for remaining duration options
...
A recent PR added `(ns|us|ms|s|m|h)` to the descriptions of some
duration options, but not all. Add it to the remaining options for
consistency.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit 32b12a28fc
2016-11-21 14:44:33 -08:00
Vincent Demeester
05eb544ae2
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>
(cherry picked from commit 158388ef8d
2016-11-21 13:23:24 -08:00
Vincent Demeester
040d4ebd58
Update cli reference for docker {,stack} deploy
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 88cdfc512b
2016-11-21 13:23:24 -08:00
Zhang Wei
db8991c957
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>
(cherry picked from commit 4d54d30477
2016-11-21 13:23:24 -08:00
zhukj
20f3c552e0
close the file
...
Signed-off-by: zhukj <zhu.kunjia@zte.com.cn>
(cherry picked from commit cf3ef262b1
2016-11-21 13:23:23 -08:00
Harald Albers
a20820b05c
Add bash completion for dockerd --userland-proxy-path
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 0d573a62f7
2016-11-21 13:23:23 -08:00
Derek McGowan
68e99239d3
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)
(cherry picked from commit c8f826f407
2016-11-21 13:23:23 -08:00
bbayani
a47957d6f6
Clarify that ipmasq rules are not added when iptables is false
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit db3f06fd97
2016-11-21 13:23:23 -08:00
Nishant Totla
5b81d7e8b5
Suppressing digest for docker service ls/ps
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
(cherry picked from commit e7d83fdb9a
2016-11-21 13:23:23 -08:00
Yanqiang Miao
4acf6aa456
The type of 'ExportdPorts' should be 'nat.PortSet'
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
(cherry picked from commit c44c542d95
2016-11-21 13:23:16 -08:00
Vincent Demeester
f44e2dca56
Update compose-file to bc280351b9589b05c6da031d9f93c5c5d22db922
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit b0903c9db0
2016-11-21 11:48:27 -08:00
Vincent Demeester
c8e2552827
Add support for healthcheck in composefile v3
...
`docker stack deploy` now supports a composefile v3 format that have a
healthcheck.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 3bd64de7a9
2016-11-21 11:48:22 -08:00
Daniel Nephin
a0df810219
Default parallelism to 1.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 7c1b399235
2016-11-21 11:48:16 -08:00
