937027a0cb
Merge pull request #28514 from Microsoft/jjh/workdir
...
Refix COPY file . after WORKDIR (now always created)
2016-11-28 12:58:17 -05:00
35fd96f3f9
Merge pull request #28886 from mstanleyjones/fix_redirect_loop
...
Fix some redirect loops and problems
2016-11-28 18:49:36 +01:00
a1f55dca21
Fix some redirect loops and problems
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-28 09:46:38 -08:00
783d4ac6d4
Merge pull request #28625 from albers/completion-plugins
...
Add bash completion for plugin API
2016-11-28 08:56:53 -08:00
b20bf510e5
Merge pull request #28822 from yuexiao-wang/modify-plugin
...
Modify repoName to PLUGIN for docker plugin create
2016-11-28 17:52:04 +01:00
56a979801a
Merge pull request #28877 from vdemeester/dont-export-accepted-filter
...
AcceptedFilters in router/network/filter.go should not be exported
2016-11-28 17:40:15 +01:00
85a99c8891
Merge pull request #28657 from erxian/fix-doc-about-service-create
...
fix doc about service create in docker_remote_api_v1.24.md
2016-11-28 16:06:50 +01:00
76459076c2
Merge pull request #28882 from vdemeester/remove-stack_config-doc
...
Remove docker stack config commandline reference doc
2016-11-28 15:34:29 +01:00
c04cf54d4e
Merge pull request #28865 from albers/docs-stack-ls-aliases
...
Add aliases and options to `docker stack ls` docs
2016-11-28 15:27:35 +01:00
3f98871a19
Remove docker stack config commandline reference doc
...
`docker stack config` command does not exists anymore, removing it
from the command reference documentation.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-28 15:25:52 +01:00
e517d7975e
AcceptedFilters in router/network/filter.go should not be exported
...
It's not used elsewhere and doesn't need to be exported.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-28 14:14:50 +01:00
33b6ef02cb
Merge pull request #28868 from ohmk/fix-a-description-of-docker-swarm-init
...
fix description of 'docker swarm init'
2016-11-28 04:11:31 -08:00
4a3207de5b
fix more according to the actual output of 'docker swarm init --help'
...
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
2016-11-28 18:40:11 +09:00
3abee1bf8a
fix description of 'docker swarm init'
...
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
2016-11-28 13:24:02 +09:00
d5dee554ea
Merge pull request #28857 from miaoyq/fix-a-description-of-docker-run
...
Fix description and link of 'docker run [-a]'
2016-11-28 10:31:06 +09:00
9439b2b7e2
Merge pull request #28866 from albers/completion-service--host
...
Add bash completion for `docker service {create,update}` host options
2016-11-27 20:22:02 -05:00
f3b7f40aaf
Add bash completion for `docker service {create,update}` host options
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-11-27 05:08:35 -08:00
8260366dd2
Add aliases and options to `docker stack ls` docs
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-11-27 04:38:49 -08:00
9dc0c8ec32
Merge pull request #28824 from lixiaobing10051267/masterPlugin2
...
modify invalid url in plugins_network.md
2016-11-26 23:22:52 +01:00
ecb707cb0f
Add bash completion for plugin API
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-11-26 11:04:55 -08:00
08ff4f427e
Fix a description of 'docker run [-a]'
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-11-26 22:56:29 +08:00
76a0dfaa8e
Merge pull request #28710 from miaoyq/eliminate-redundant-parameters
...
Eliminate the redundant parameter
2016-11-26 14:37:17 +01:00
ce0068ed04
Merge pull request #28780 from vieux/accept_src_in_secret
...
support src in --secret
2016-11-26 14:34:30 +01:00
022c13271b
Merge pull request #28829 from lixiaobing10051267/masterDaemon
...
check typos and fix in daemon directory
2016-11-26 14:33:09 +01:00
2f5dbd63b0
Merge pull request #28855 from YuPengZTE/devMD023
...
fix the typo
2016-11-26 14:31:54 +01:00
41b7687758
Merge pull request #28856 from sdurrheimer/zsh-completion-service-update-hostname
...
Add zsh completion for 'docker service update --hostname'
2016-11-26 14:30:07 +01:00
b23fbc3fbd
Add zsh completion for 'docker service update --hostname'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-26 14:13:00 +01:00
cf4f5b4771
check typos and fix in daemon directory
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-11-26 17:23:21 +08:00
6e1339bbc6
fix the mistake of present
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
2016-11-26 17:11:19 +08:00
c36c63b308
Merge pull request #28815 from dnephin/add-short-option
...
Add a short flag for docker stack deploy
2016-11-25 21:18:09 +01:00
f1dd721b69
Add a short flag for docker stack deploy
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-25 13:23:36 -05:00
7dcd7b8ec5
Merge pull request #28841 from justincormack/sandbox-error
...
Fix grammar on error message
2016-11-25 11:54:36 -05:00
c394034f59
Modify reponame to PLUGIN and fix some typos
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-11-25 23:09:46 +08:00
cd5c8e9c2d
Fix grammar on error message
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-25 14:58:20 +00:00
28c3d5c2f9
Merge pull request #28833 from albers/completion-service-update--hostname
...
Add bash completion for `docker service update --hostname`
2016-11-25 14:03:54 +01:00
58d59c63e0
Merge pull request #28832 from runcom/seccomp-comment-fix
...
profiles/seccomp: fix comment
2016-11-25 21:31:29 +09:00
e026f80a4d
Merge pull request #28759 from miaoyq/optimization-context-name1
...
Optimize the function 'Context.Name()' and replace 'Context.Container…
2016-11-25 13:25:17 +01:00
9d98d6d8cb
Add bash completion for `docker service update --hostname`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-11-25 12:42:30 +01:00
197f3ee687
profiles/seccomp: fix comment
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-11-25 11:40:54 +01:00
a24c750c7c
Merge pull request #28779 from Microsoft/jjh/tp5-runtests
...
Windows: Update TP5 refs in run_test.go
2016-11-25 10:27:22 +01:00
3e58117608
Merge pull request #28771 from dnephin/add-missing-service-hostname-update
...
Allow hostname to be updated on service
2016-11-25 10:26:06 +01:00
fc7c235f84
modify invalid url in plugins_network.md
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-11-25 15:40:51 +08:00
b8e3a28d65
Merge pull request #28818 from miaoyq/fix-some-syntax-err
...
Fix some syntax error
2016-11-24 22:26:25 -05:00
18724726c2
Fix some syntax error
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-11-25 10:03:28 +08:00
1c65cb6657
Allow hostname to be updated on service.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-24 15:44:35 -05:00
03ba9a4922
Merge pull request #28794 from yongtang/28786-docs-network-ls-dangling
...
Update docs of `docker network ls --filter`
2016-11-24 19:16:57 +01:00
8602d97835
Merge pull request #28804 from bfirsh/better-service-network-overlay-error-message
...
Improve error when connecting service to network
2016-11-24 09:06:51 -08:00
2510f254ee
Update docs of `docker network ls --filter`
...
Currently the help output of `docker network ls --filter` is:
```
Options:
-f, --filter value Provide filter values (i.e. 'dangling=true') (default [])
...
```
This caused confusion as only the following filters are supported at the moment:
- `driver`
- `type`
- `name`
- `id`
- `label`
This fix update the help output of `docker network ls --filter` and `network_ls.md`.
The `dangling=true` description has been replace to:
```
Options:
-f, --filter filter Provide filter values (i.e. 'driver=bridge')
...
```
This fix fixes 28786.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-11-24 08:14:36 -08:00
82c858c8b6
Merge pull request #28803 from ijc25/check-config-legacy-vsyscall
...
check-config check for LEGACY_VSYSCALL_* options
2016-11-24 08:10:27 -08:00
ab397c95e6
Merge pull request #28772 from yongtang/28769-checkpoint-id-name-check
...
Restrict checkpoint name to prevent directory traversal
2016-11-24 17:09:01 +01:00
Doug Davis
Sebastiaan van Stijn
Misty Stanley-Jones
Kenfe-Mickaël Laventure
Vincent Demeester
Antonio Murdaca
Justin Cormack
Kei Ohmura
Akihiro Suda
Brian Goff
Harald Albers
Yanqiang Miao
Steve Durrheimer
lixiaobing10051267
yupeng
Daniel Nephin
yuexiao-wang
Antonio Murdaca
Yong Tang