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

29348 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Goff
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
Harald Albers
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
Sebastiaan van Stijn
9dc0c8ec32 Merge pull request #28824 from lixiaobing10051267/masterPlugin2 
modify invalid url in plugins_network.md
 2016-11-26 23:22:52 +01:00
Antonio Murdaca
76a0dfaa8e Merge pull request #28710 from miaoyq/eliminate-redundant-parameters 
Eliminate the redundant parameter
 2016-11-26 14:37:17 +01:00
Antonio Murdaca
ce0068ed04 Merge pull request #28780 from vieux/accept_src_in_secret 
support src in --secret
 2016-11-26 14:34:30 +01:00
Antonio Murdaca
022c13271b Merge pull request #28829 from lixiaobing10051267/masterDaemon 
check typos and fix in daemon directory
 2016-11-26 14:33:09 +01:00
Antonio Murdaca
2f5dbd63b0 Merge pull request #28855 from YuPengZTE/devMD023 
fix the typo
 2016-11-26 14:31:54 +01:00
Antonio Murdaca
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
Steve Durrheimer
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
lixiaobing10051267
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
yupeng
6e1339bbc6 fix the mistake of present 
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
 2016-11-26 17:11:19 +08:00
Vincent Demeester
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
Daniel Nephin
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
Doug Davis
7dcd7b8ec5 Merge pull request #28841 from justincormack/sandbox-error 
Fix grammar on error message
 2016-11-25 11:54:36 -05:00
Justin Cormack
cd5c8e9c2d Fix grammar on error message 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-11-25 14:58:20 +00:00
Sebastiaan van Stijn
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
Akihiro Suda
58d59c63e0 Merge pull request #28832 from runcom/seccomp-comment-fix 
profiles/seccomp: fix comment
 2016-11-25 21:31:29 +09:00
Sebastiaan van Stijn
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
Harald Albers
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
Antonio Murdaca
197f3ee687
profiles/seccomp: fix comment 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-11-25 11:40:54 +01:00
Vincent Demeester
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
Vincent Demeester
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
lixiaobing10051267
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
Doug Davis
b8e3a28d65 Merge pull request #28818 from miaoyq/fix-some-syntax-err 
Fix some syntax error
 2016-11-24 22:26:25 -05:00
Yanqiang Miao
18724726c2 Fix some syntax error 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2016-11-25 10:03:28 +08:00
Daniel Nephin
1c65cb6657 Allow hostname to be updated on service. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-24 15:44:35 -05:00
Vincent Demeester
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
Justin Cormack
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
Yong Tang
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
Justin Cormack
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
Vincent Demeester
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
Vincent Demeester
7aae360c41 Merge pull request #28802 from yuexiao-wang/fix-cli-typo 
Add options for docker plugin enable and fix some typos
 2016-11-24 17:03:56 +01:00
yuexiao-wang
9e414bfa6b Add options for docker plugin enable and fix some typos 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-11-25 04:07:06 +08:00
Ben Firshman
70acb89fa2
Improve error when connecting service to network 
The error didn't hint at how to resolve it. Google auto-suggest
also implies that people have been Googling this error.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-24 14:43:24 +00:00
Justin Cormack
0f79746f3d Merge pull request #28800 from lixiaobing10051267/masterState 
Fix some output information for container test
 2016-11-24 06:21:07 -08:00
Sebastiaan van Stijn
b3687bdcdc Merge pull request #28602 from dattatrayakumbhar04/nw-connect-paused-container-doc 
28600: Docs: network connect for container in Created/Stopped state
 2016-11-24 15:04:53 +01:00
lixiaobing10051267
92ee5a5d3a Fix some output information for container test 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-11-24 20:01:00 +08:00
Ian Campbell
163db04452 Check for LEGACY_VSYSCALL_* options 
Chosing LEGACY_VSYSCALL_NONE (over NATIVE or EMULATE) will mean that binaries
using eglibc <= 2.13 will not run (segfault).

Fixes #28705.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-11-24 11:39:05 +00:00
Yanqiang Miao
52fd6e4664 Optimize the function 'Context.Name()' and replace 'Context.ContainerName' that need to remove slash with 'Context.Name()'. 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2016-11-24 09:24:29 +08:00
Sebastiaan van Stijn
e47ca825d1 Merge pull request #28757 from minamijoyo/fix-broken-markdown-in-changelog 
Fix broken markdown in CHANGELOG.md
 2016-11-24 02:05:03 +01:00
Victor Vieux
32229914c7 Merge pull request #28773 from dnephin/exit-status 
exit with status 1 if help is called on an invalid command
 2016-11-23 15:13:29 -08:00
John Howard
f93c04d1ed Merge pull request #28667 from Microsoft/jjh/env-case-sensitive 
Windows: Case insensitive env vars
 2016-11-23 14:40:16 -08:00
Victor Vieux
f70470b71e support src in --secret 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-11-23 14:30:57 -08:00
John Howard
38faf6e043 Windows: Update TP5 refs in run_test.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-11-23 14:28:06 -08:00
Alexander Morozov
6b12887c3e Merge pull request #28777 from Microsoft/jjh/fixtypo-bin-mounts 
Fixes typo 'bin-mounts'
 2016-11-23 14:04:03 -08:00
John Howard
c8c1dfbaf3 Fixes typo 'bin-mounts' 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-11-23 14:01:57 -08:00
Vincent Demeester
205291c5f3 Merge pull request #28675 from dnephin/no-swarmmode-error-on-deploy 
Better error message on stack deploy when not a swarm manager
 2016-11-23 22:47:13 +01:00
Yong Tang
c90ec05175 Restrict checkpoint name to prevent directory traversal 
This fix tries to address the issue raised in 28769 where
checkpoint name was not checked before passing to containerd.
As a result, it was possible to use a special checkpoint name
to get outside of the container's directory.

This fix add restriction `[a-zA-Z0-9][a-zA-Z0-9_.-]+` (`RestrictedNamePattern`).
This is the same as container name restriction.

This fix fixes 28769.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-11-23 13:23:07 -08:00
John Howard
b2049a84de Windows: Case insensitive env vars 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-11-23 12:57:33 -08:00
Victor Vieux
ae64cae74e Merge pull request #28760 from ehazlett/carry-28576 
Update Secret Command help (carry #28576)
 2016-11-23 12:29:55 -08:00