Commit Graph

30897 Commits

Author SHA1 Message Date
Akihiro Suda
eac68dbbbc Merge pull request #30340 from ijrandom/master
Fix #30311: dockerd leaks ExecIds on failed exec -i
2017-02-14 10:13:16 +09:00
Vincent Demeester
4163b5cbd5 Merge pull request #30983 from tianon/usr-bin-env-bash
Convert script shebangs from "#!/bin/bash" to "#!/usr/bin/env bash"
2017-02-13 20:48:05 +01:00
Aaron Lehmann
b8a3595941 Merge pull request #30834 from allencloud/refactor-daemon-cluster-handler-and-helper
refactor cluster/helper.go and split cluster.go into multiple files
2017-02-13 11:31:30 -08:00
Kenfe-Mickaël Laventure
c9fa3eed1b Merge pull request #30823 from albers/completion-plugin-upgrade
Add bash completion for `docker plugin upgrade`
2017-02-13 11:09:21 -08:00
Tianon Gravi
52379fa76d Convert script shebangs from "#!/bin/bash" to "#!/usr/bin/env bash"
This is especially important for distributions like NixOS where `/bin/bash` doesn't exist, or for MacOS users who've installed a newer version of Bash than the one that comes with their OS.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2017-02-13 11:01:54 -08:00
Alexander Morozov
ca3f82752c Merge pull request #30980 from albers/completion-mode-non-blocking
Fix bash completion for `--log-opt mode`
2017-02-13 11:00:27 -08:00
Vincent Demeester
5870675ebc Merge pull request #29864 from tianon/schemaVersion-2
Update "download-frozen-image-v2.sh" for schemaVersion 2
2017-02-13 19:53:19 +01:00
Brian Goff
6fb658eaed Merge pull request #30970 from cmehay/install
Force copy on make install to avoid Text file busy error
2017-02-13 13:49:46 -05:00
Harald Albers
2c52ec8403 Add bash completion for docker plugin upgrade
Signed-off-by: Harald Albers <github@albersweb.de>
2017-02-13 19:36:54 +01:00
Harald Albers
1fdb54eaf3 Fix bash completion for --log-opt mode
Signed-off-by: Harald Albers <github@albersweb.de>
2017-02-13 18:49:37 +01:00
Alexander Morozov
f3a8886d88 Merge pull request #29673 from vdemeester/extract-daemon-config
Extract daemon configuration and discovery to their own package
2017-02-13 09:11:13 -08:00
Brian Goff
019eb5d71f Merge pull request #30851 from chchliang/networktest
add testcase check connect.EndpointConfig not nil
2017-02-13 10:58:02 -05:00
Brian Goff
9ec42d4c3c Merge pull request #30948 from sdurrheimer/zsh-completion-service-format
Add zsh completion for 'docker {service ls,stack services} --format'
2017-02-13 09:57:15 -05:00
Brian Goff
ae190da1d2 Merge pull request #30949 from sdurrheimer/zsh-completion-ps-ports-filter
Add zsh completion for 'docker {ps,service ls} --filter expose|publish'
2017-02-13 09:44:46 -05:00
Brian Goff
6ab2220043 Merge pull request #30947 from sdurrheimer/zsh-completion-daemon-default-shm-size
Add zsh completion for 'dockerd --default-shm-size'
2017-02-13 09:34:42 -05:00
Brian Goff
0d9bb4ee12 Merge pull request #30944 from sdurrheimer/zsh-completion-build-squash
Add zsh completion for 'docker build --squash'
2017-02-13 09:33:39 -05:00
Christophe Mehay
01273ad85f Force copy on make install to avoid Text file busy error
Signed-off-by: Christophe Mehay <cmehay@online.net>
2017-02-13 14:17:06 +01:00
Vincent Demeester
a11e3bd5f9 Merge pull request #30871 from allencloud/split-swarm-test-into-multiple-files
split docker_api_swarm_test.go into multiple files
2017-02-13 11:42:25 +01:00
Sebastiaan van Stijn
a8f4d82176 Merge pull request #30965 from YuPengZTE/devDes
fix typo
2017-02-13 00:02:28 -08:00
yupengzte
266107f301 fix typo
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
2017-02-13 15:47:38 +08:00
Sebastiaan van Stijn
b5b6752230 Merge pull request #30956 from yongtang/02122017-deprecated-login-email-removal
Add missing link in deprecated.md
2017-02-12 23:37:37 -08:00
Sebastiaan van Stijn
27ab008626 Merge pull request #30940 from sdurrheimer/zsh-completion-swarm-unlock-cmds
Add zsh completion for 'docker swarm unlock|unlock-key' commands
2017-02-12 23:35:46 -08:00
Sebastiaan van Stijn
db68291dab Merge pull request #30960 from allencloud/remove-redundant-colon
remove redundant colon introduced by mistake
2017-02-12 18:22:32 -08:00
allencloud
df64bc3ed0 remove redundant colon introduced by mistake
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-02-13 10:16:57 +08:00
Yong Tang
ee65dd0286 Add missing link in deprecated.md
This fix adds a missing link in deprecated.md
```
Deprecated In Release: [v1.13.0]...
```

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-02-12 15:15:52 -08:00
Vincent Demeester
c110abfa9f Merge pull request #30900 from YuPengZTE/devPublisedPort
Add "=" before the value of PublishedPort
2017-02-12 21:56:43 +01:00
Vincent Demeester
5d47cb901b Merge pull request #30939 from sdurrheimer/zsh-completion-swarm-init-update
Add zsh completion for missing 'docker swarm init|update' options
2017-02-12 21:49:00 +01:00
Steve Durrheimer
ac56080930 Add zsh completion for 'docker {ps,service ls} --filter expose|publish'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-02-12 21:24:13 +01:00
Steve Durrheimer
8afb7f035d Add zsh completion for 'docker {service ls,stack services} --format'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-02-12 21:17:00 +01:00
Steve Durrheimer
1c387303af Add zsh completion for 'dockerd --default-shm-size'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-02-12 21:10:37 +01:00
Steve Durrheimer
5b3f5f97f2 Add zsh completion for 'docker build --squash'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-02-12 20:11:13 +01:00
Steve Durrheimer
e9a10ef4ad Add zsh completion for 'docker swarm unlock|unlock-key' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-02-12 17:44:17 +01:00
Steve Durrheimer
e31a6f278b Add zsh completion for missing 'docker swarm init|update' options
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-02-12 17:31:32 +01:00
Sebastiaan van Stijn
58152530cc Merge pull request #30886 from vieux/bring_back_changelog
add 1.13.x CHANGELOG to master
2017-02-11 18:19:00 -08:00
Sebastiaan van Stijn
e5066ef666 Merge pull request #30476 from yongtang/30447-port-config-long-syntax
Support expanded syntax of ports in `docker stack deploy`
2017-02-11 11:13:54 -08:00
allencloud
75a315d43e create a new file swarm.go and move swarm part code from cluster.go into swarm.go
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-02-12 02:54:07 +08:00
allencloud
4f4151bba4 create a new file networks.go and move network part codes from cluster.go into networks.go
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-02-12 02:50:17 +08:00
allencloud
6be675c752 create a new file task.go and move task part codes from cluster.go into tasks.go
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-02-12 02:45:00 +08:00
allencloud
6ff14b48c7 create a new file services.go and move service part codes from cluster.go into services.go
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-02-12 02:43:23 +08:00
allencloud
7591e313a4 create a new file nodes.go and move node part codes from cluster.go into nodes.go
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-02-12 02:36:09 +08:00
allencloud
b6fb3a56dc refactor helper.go and move getSecret to helper.go
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-02-12 02:30:53 +08:00
Akihiro Suda
9a6ebf08e7 Merge pull request #30905 from allencloud/remove-redudant-code-in-unlock-and-better-error-msg
remove redundant code and better error msg
2017-02-11 20:13:31 +09:00
allencloud
5c0ea56d56 remove redundant code and better error msg
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-02-11 09:22:07 +08:00
Sebastiaan van Stijn
584e399d96 Merge pull request #30889 from aaronlehmann/addreference-tag-digest
reference: Handle combination of tag and digest in AddReference
2017-02-10 13:27:12 -08:00
Dmitry Shyshkin
3cc0d6bb04 Fix #303111: dockerd leaks ExecIds on failed exec -i
Signed-off-by: Dmitry Shyshkin <dmitry@shyshkin.org.ua>
2017-02-10 21:13:00 +02:00
Brian Goff
be6481041d Merge pull request #30903 from allencloud/remove-unused-headers-in-secret-create
remove unused headers in secret_create.go
2017-02-10 14:10:31 -05:00
Sebastiaan van Stijn
1eb2841334 Merge pull request #30839 from yongtang/02082017-swarmkit-update
Update SwarmKit to ed384f3b3957f65e3111bd020f9815f3d4296fa2
2017-02-10 10:14:30 -08:00
Brian Goff
69be892c9d Merge pull request #30901 from xulike666/fight-for-readability
Fix some easy typos in cmd/* :D
2017-02-10 13:09:25 -05:00
Misty Stanley-Jones
c621fbce04 Merge pull request #29559 from mstanleyjones/define_bridge
Define bridge networks
2017-02-10 09:25:29 -08:00
allencloud
69afd30444 split docker_api_swarm_test.go into multiple files
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-02-11 00:18:01 +08:00