0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
29305 commits 14 branches 412 tags 338 MiB
Commit graph

29305 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tibor Vass
9f239281b1 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>
 2016-11-21 14:52:14 -08:00
Victor Vieux
eac91a19d6 Merge pull request #28677 from dnephin/remove-deploy-experimental 
Move `docker stack` out of experimental
 2016-11-21 14:33:35 -08:00
Alessandro Boch
f9cff5e267 Vendor libkv @ 1d84310 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-11-21 14:07:51 -08:00
Victor Vieux
99a7289632 Merge pull request #28328 from aaronlehmann/duration-opts 
cli: Add valid suffixes for remaining duration options
 2016-11-21 14:03:00 -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
Alexander Morozov
9bd7189527 Merge pull request #28673 from aboch/vnd 
Vendoring libnetwork @dd0ddde
 2016-11-21 13:46:14 -08:00
Andrew Hsu
060196ee4c allow replacing httpredir or deb mirror in jessie 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2016-11-21 13:34:05 -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
Anusha Ragunathan
5890091cc0 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>
 2016-11-21 13:29:13 -08:00
Alexander Morozov
9326fb1389 Merge pull request #28670 from cpuguy83/update_syslog_driver 
re-vendor syslog log driver
 2016-11-21 13:19:47 -08:00
Anusha Ragunathan
83ca993c15 Add HTTP client timeout. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-11-21 13:11:40 -08:00
Vincent Demeester
05963010ee Merge pull request #28556 from ehazlett/container-secret-store 
Fix target reference secrets and container secret store
 2016-11-21 21:40:01 +01:00
Daniel Nephin
6df5baf30f Move docker stack out of experimental 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-21 15:30:25 -05:00
Darren Stahl
baac0ef67f Update hcsshim 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-11-21 11:45:32 -08:00
Alessandro Boch
948c7fdb94 Vendoring libnetwork @dd0ddde 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-11-21 11:44:58 -08:00
Madhu Venugopal
111a95fb50 Merge pull request #28562 from tomdee/bump-libnetwork 
Update libnetwork version for IPv6 support
 2016-11-21 11:30:00 -08:00
Brian Goff
00caf03132 re-vendor syslog log driver 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-11-21 14:24:53 -05:00
Vincent Demeester
e349d3d330 Merge pull request #28466 from miaoyq/update-a-var-type 
The type of 'ExportdPorts' should be 'nat.PortSet'
 2016-11-21 20:23:10 +01:00
Victor Vieux
fb7e9a908b Merge pull request #28663 from vdemeester/28633-do-not-panic-on-empty-network 
Do not panic if network is nil
 2016-11-21 10:48:03 -08:00
Sebastiaan van Stijn
6cc645c938 Merge pull request #28615 from dmcgowan/update-v1-deprecation-doc 
Update deprecation notes about v1 registry
 2016-11-21 19:16:38 +01:00
Victor Vieux
51c107b64f Merge pull request #28647 from WeiZhang555/dont-lock-client-version 
Bugfix: set cli.manualOverride when env var not empty
 2016-11-21 09:52:35 -08:00
Derek McGowan
c8f826f407
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)
 2016-11-21 09:39:48 -08:00
Vincent Demeester
158388ef8d
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>
 2016-11-21 17:59:29 +01:00
Sebastiaan van Stijn
ca4d907851 Merge pull request #28656 from vdemeester/update-docker-deploy-ref-doc 
Update cli reference for docker {,stack} deploy
 2016-11-21 17:46:08 +01:00
Sebastiaan van Stijn
90993640f0
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>
 2016-11-21 17:39:58 +01:00
Vincent Demeester
278e01d6de Merge pull request #28539 from nishanttotla/pin-image-digest-ux 
Suppressing digest for docker service ls/ps
 2016-11-21 14:06:37 +01:00
Vincent Demeester
88cdfc512b
Update cli reference for docker {,stack} deploy 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-21 12:36:31 +01:00
Felix Ruess
015e83a8da build debian package for armhf ubuntu-xenial 
Signed-off-by: Felix Ruess <felix.ruess@gmail.com>
 2016-11-21 12:34:20 +01:00
Sebastiaan van Stijn
5c6e649fde Merge pull request #28648 from YuPengZTE/devBareURL 
fix the mistak of url format
 2016-11-21 11:03:43 +01:00
Zhang Wei
4d54d30477 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>
 2016-11-21 17:31:46 +08:00
Vincent Demeester
3739c3bed3 Merge pull request #28294 from vdemeester/compose-swarm-healthcheck 
Add support for healthcheck in compose to swarm
 2016-11-21 10:28:37 +01:00
allencloud
89100c162b judge manager if locked before parsing key 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-21 16:39:09 +08:00
yupeng
0655d5cd1f Bare URL used 
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
 2016-11-21 16:30:09 +08:00
Akihiro Suda
fa314aa52e 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>
 2016-11-21 07:13:11 +00:00
Lei Jitang
103f2e56bf Merge pull request #28644 from zhukj/daemon-config 
close the file
 2016-11-21 13:50:26 +08:00
zhukj
cf3ef262b1 close the file 
Signed-off-by: zhukj <zhu.kunjia@zte.com.cn>
 2016-11-21 19:56:01 +08:00
Lei Jitang
8976934806 Merge pull request #28637 from albers/completion-dockerd--userland-proxy-path 
Add bash completion for `dockerd --userland-proxy-path`
 2016-11-21 13:48:10 +08:00
Vincent Demeester
baa14c0e61 Merge pull request #28026 from ripcurld00d/fix_27772 
Return an empty stats if the container is restarting
 2016-11-20 21:14:37 +01:00
Harald Albers
0d573a62f7 Add bash completion for dockerd --userland-proxy-path 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-11-20 09:58:39 -08:00
Vincent Demeester
227af35a17 Merge pull request #28607 from mstanleyjones/28133_iptables_false 
Clarify that ipmasq rules are not added when iptables is false
 2016-11-20 17:35:31 +01:00
Tom Denham
5d983d21bf Update tests to handle bug fix from libnetwork 
Signed-off-by: Tom Denham <tom@tomdee.co.uk>
 2016-11-19 16:34:56 -08:00
Tom Denham
d96baf28d4 Update netlink library (required for libnetwork) 
Signed-off-by: Tom Denham <tom@tomdee.co.uk>
 2016-11-19 16:12:39 -08:00
Tom Denham
5b76fe4a35 Update libnetwork to latest version 
Signed-off-by: Tom Denham <tom@tomdee.co.uk>
 2016-11-19 16:12:32 -08:00
Harald Albers
e84d62f6cb Add bash completion for docker images --filter reference 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-11-19 13:05:51 -08:00
Vincent Demeester
c8bf933697 Merge pull request #28563 from darrenstahlmsft/ShutdownOnStop 
Shutdown instead of terminate process on Windows
 2016-11-19 18:22:51 +01:00
Vincent Demeester
2b680b1573 Merge pull request #28451 from Ghnuberath/master 
Add HostConfig.Tmpfs to docs for container creation remote API
 2016-11-19 18:22:15 +01:00
Antonio Murdaca
514ca09426
api: types: keep info.SecurityOptions a string slice 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-11-19 13:21:16 +01:00
Doug Davis
96f50e9b70 Merge pull request #28611 from vieux/fix_golint 
fix a few golint errors
 2016-11-19 07:16:44 -05:00
Victor Vieux
f6f67891be Merge pull request #28438 from vdemeester/use-container-shell-instead-of-hardcoded 
Use Container.Config.Shell instead of hardcoded…
 2016-11-18 18:54:36 -08:00
Victor Vieux
c3fab6d473 Merge pull request #28524 from aluzzardi/experimental-routes 
router: Return explicit error rather than 404 for experimental.
 2016-11-18 18:49:15 -08:00