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

29190 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Victor Vieux
0337822d34 Merge pull request #28561 from vieux/poc_cmd_error_unsuported 
error on cli when trying to use experimental feature with non experimental daemon
 2016-11-18 18:47:36 -08:00
Victor Vieux
eb8fc5dcc3 Merge pull request #28605 from cpuguy83/use_v2_for_graph_plugins 
Allow graphdriver plugins to use v2
 2016-11-18 18:45:34 -08:00
Tibor Vass
ee6f3b6796 Merge pull request #28613 from vieux/fix_govet 
skip api/types/container/ (like golint) and fix one pkg
 2016-11-18 18:35:37 -08:00
Victor Vieux
9c559e6d0b fix a few golint errors 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-11-18 18:32:02 -08:00
Victor Vieux
79a891efb7 skip api/types/container/ (like golint) and fix one pkg 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-11-18 16:33:50 -08:00
Victor Vieux
a0866bd679 Merge pull request #28599 from aluzzardi/revendor-swarmkit 
[master] Revendor SwarmKit to 9bca23b0de42a9ebcc71622a30d646afa1e2b564
 2016-11-18 16:23:54 -08:00
Victor Vieux
697b6b504a Merge pull request #28610 from vieux/fix_gofmt 
fix gofmt in master
 2016-11-18 15:21:39 -08:00
Victor Vieux
9f348d5625 fix gofmt in master 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-11-18 15:20:19 -08:00
Michael Crosby
8851e6ba70 Merge pull request #28603 from thaJeztah/flipping-hosts 
swap position of "host" and "ip"
 2016-11-18 14:58:04 -08:00
bbayani
db3f06fd97 Clarify that ipmasq rules are not added when iptables is false 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-18 14:25:24 -08:00