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

29322 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
dattatrayakumbhar04
16c9cdad6f 28600: Docs: network connect for container in Created/Stopped state 
Signed-off-by: dattatrayakumbhar04 <dattatraya.kumbhar@gslab.com>
 2016-11-23 20:20:37 +00:00
Daniel Nephin
bb7601a3ff exit with status 1 if help is called on an invalid command. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-23 15:13:58 -05:00
Alexander Morozov
1640bb23b1 Merge pull request #28728 from aluzzardi/swarmkit-revendor-53fcdeba083627b1a2616612a103019b73c6d5ce 
revendor swarmkit to 53fcdeba083627b1a2616612a103019b73c6d5ce
 2016-11-23 09:24:23 -08:00
Daniel Nephin
c72daf953a Better error message on stack deploy against not a swarm. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-23 12:15:11 -05:00
Vincent Demeester
2c978bd946 Merge pull request #28765 from vdemeester/update-docker-info-docs 
Update docker info cli reference documentation
 2016-11-23 17:27:08 +01:00
Vincent Demeester
bbe1a7f84f Merge pull request #28749 from runcom/remove-notneeded-unmarshal 
daemon: remove not needed unmarshal
 2016-11-23 17:22:23 +01:00
Vincent Demeester
d28eaa1171
Update docker info cli reference documentation 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-23 17:20:12 +01:00
Sebastiaan van Stijn
6e8479bdfa Merge pull request #28753 from vdemeester/fix-userns-integration-cli 
Fixes some integration-cli on userns
 2016-11-23 16:14:41 +01:00
erxian
d87c91e39f update secret command 
Signed-off-by: erxian <evelynhsu21@gmail.com>
 2016-11-23 10:07:09 -05:00
Vincent Demeester
55cd9c4edc Merge pull request #28758 from vdemeester/update-plugin-enable-cli-doc 
Update plugin enable cli reference documentation
 2016-11-23 15:53:02 +01:00
Vincent Demeester
43297dd6f8
Update plugin enable cli reference documentation 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-23 15:42:40 +01:00
Masayuki Morita
2ca39d27a6 Fix broken markdown in CHANGELOG.md 
Signed-off-by: Masayuki Morita <minamijoyo@gmail.com>
 2016-11-23 23:26:07 +09:00
Sebastiaan van Stijn
04d60a44d7 Merge pull request #28743 from albers/docs-stack-experimental 
Move `docker stack` docs out of experimental
 2016-11-23 14:17:09 +01:00
Vincent Demeester
eb5fe064cf
Fixes some integration-cli on userns 
Mainly adding requirements on Network or NotUserNamespace to make it pass.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-23 14:03:53 +01:00
Antonio Murdaca
30b8712e93
daemon: remove not needed unmarshal 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-11-23 12:53:25 +01:00
Harald Albers
bb96e18b19 Move docker stack docs out of experimental 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-11-23 11:14:38 +01:00
Alexander Morozov
5afdacb20e Merge pull request #28455 from Microsoft/jjh/autogen 
Windows: Native autogen
 2016-11-22 18:18:12 -08:00
Victor Vieux
7c6f001248 Merge pull request #28716 from ehazlett/fix-multi-secret-inspect 
Update secret inspect to support IDs
 2016-11-22 17:39:48 -08:00
Victor Vieux
0633c558bb Merge pull request #28733 from thaJeztah/use-official-fedora25-image 
Use official fedora 25 image
 2016-11-22 17:38:01 -08:00
Sebastiaan van Stijn
545a2f009e
Use official fedora 25 image 
Fedora 25 was released today, and the official
image will be available soon.

This removes the temporary override, so that
we can build using the official image.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-11-23 02:19:02 +01:00
Andrea Luzzardi
51247185a2 revendor swarmkit to 53fcdeba083627b1a2616612a103019b73c6d5ce 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2016-11-22 17:01:02 -08:00
Tõnis Tiigi
5c1826ec4d Merge pull request #28683 from darrenstahlmsft/SystemDLL 
Swap usage of LazyDLL and LoadDLL to LazySystemDLL
 2016-11-22 16:58:30 -08:00
Victor Vieux
22ba220e86 Merge pull request #28727 from cyli/do-not-display-secret-digest 
Do not display the digest or size of swarm secrets [1.13]
 2016-11-22 16:44:06 -08:00
Anusha Ragunathan
23ea9e45fd Merge pull request #28601 from tiborvass/plugin-misc-fixes 
Plugin miscellaneous fixes
 2016-11-22 16:12:37 -08:00
cyli
fe127b7eae Update docs to reflect no longer displaying secret digest or size. 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-11-22 18:18:56 -05:00