p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,347 Commits 2 Branches 295 Tags
af53994c262b6877ab8f3327790806db45d7d9ae
Commit Graph

27589 Commits

Author SHA1 Message Date
Harald Albers
af53994c26 Add aliases and options to docker stack ls docs 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8260366dd2fae9ef15a8da52451757ef32e88aca
Component: engine
 2016-11-27 04:38:49 -08:00
Sebastiaan van Stijn
3d75a15962 Merge pull request #28824 from lixiaobing10051267/masterPlugin2 
modify invalid url in plugins_network.md
Upstream-commit: 9dc0c8ec328c02eca56556c0a2bde1503e6a9aca
Component: engine
 2016-11-26 23:22:52 +01:00
Antonio Murdaca
89a9795d2b Merge pull request #28710 from miaoyq/eliminate-redundant-parameters 
Eliminate the redundant parameter
Upstream-commit: 76a0dfaa8e77fc04d97357fcb999d669b6485db2
Component: engine
 2016-11-26 14:37:17 +01:00
Antonio Murdaca
7ac8174c1e Merge pull request #28780 from vieux/accept_src_in_secret 
support src in --secret
Upstream-commit: ce0068ed0483bd87dc4af1e7388d9b9a91431424
Component: engine
 2016-11-26 14:34:30 +01:00
Antonio Murdaca
2f9e7efdc3 Merge pull request #28829 from lixiaobing10051267/masterDaemon 
check typos and fix in daemon directory
Upstream-commit: 022c13271b274074a6190952f1888b01c13c4a7c
Component: engine
 2016-11-26 14:33:09 +01:00
Antonio Murdaca
26510bfcf5 Merge pull request #28855 from YuPengZTE/devMD023 
fix the typo
Upstream-commit: 2f5dbd63b097fe0c25d1fdbb57f094dca0f01701
Component: engine
 2016-11-26 14:31:54 +01:00
Steve Durrheimer
a785653ea6 Add zsh completion for 'docker service update --hostname' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: b23fbc3fbd133c9463c73a66e09f1dfbff902ffb
Component: engine
 2016-11-26 14:13:00 +01:00
lixiaobing10051267
115737bff2 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>
Upstream-commit: cf4f5b47710b3875767f997fc2eb3386cb0b66c0
Component: engine
 2016-11-26 17:23:21 +08:00
yupeng
09fb4fd4cc fix the mistake of present 
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: 6e1339bbc624711c992e27ebf368d53599c97a2d
Component: engine
 2016-11-26 17:11:19 +08:00
Vincent Demeester
3c733b5599 Merge pull request #28815 from dnephin/add-short-option 
Add a short flag for docker stack deploy
Upstream-commit: c36c63b308acbacefcd088f7bc0b0b68c79d9334
Component: engine
 2016-11-25 21:18:09 +01:00
Daniel Nephin
ac43a15799 Add a short flag for docker stack deploy 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f1dd721b6978f1c24bb2761b88c83d9e385bd781
Component: engine
 2016-11-25 13:23:36 -05:00
Justin Cormack
0fab75c2a1 Fix grammar on error message 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: cd5c8e9c2dc181cd624bdb10947a19197215d730
Component: engine
 2016-11-25 14:58:20 +00:00
Sebastiaan van Stijn
abc0690712 Merge pull request #28833 from albers/completion-service-update--hostname 
Add bash completion for `docker service update --hostname`
Upstream-commit: 28c3d5c2f94fcd2aec6ecfd8568034dbe1bc3709
Component: engine
 2016-11-25 14:03:54 +01:00
Akihiro Suda
26220a9b42 Merge pull request #28832 from runcom/seccomp-comment-fix 
profiles/seccomp: fix comment
Upstream-commit: 58d59c63e0ab3968ed0dcc061548c0abc02bf27d
Component: engine
 2016-11-25 21:31:29 +09:00
Sebastiaan van Stijn
94240c87f9 Merge pull request #28759 from miaoyq/optimization-context-name1 
Optimize the function 'Context.Name()' and replace 'Context.Container…
Upstream-commit: e026f80a4d217eda5622c2b984fde2cdb8da0dc3
Component: engine
 2016-11-25 13:25:17 +01:00
Harald Albers
66c7d1e16a Add bash completion for docker service update --hostname 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 9d98d6d8cb23a5078e2d81014620fdd390c32abf
Component: engine
 2016-11-25 12:42:30 +01:00
Antonio Murdaca
124e769d99 profiles/seccomp: fix comment 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 197f3ee687d8f68f8b7876b622259cd803354b86
Component: engine
 2016-11-25 11:40:54 +01:00
Vincent Demeester
3e48f2a055 Merge pull request #28779 from Microsoft/jjh/tp5-runtests 
Windows: Update TP5 refs in run_test.go
Upstream-commit: a24c750c7ccfdb2a952922f4029a76a10f811349
Component: engine
 2016-11-25 10:27:22 +01:00
Vincent Demeester
2775e09b52 Merge pull request #28771 from dnephin/add-missing-service-hostname-update 
Allow hostname to be updated on service
Upstream-commit: 3e58117608a2a7d5275c792d6d88e66c45e99655
Component: engine
 2016-11-25 10:26:06 +01:00
lixiaobing10051267
dc30d51d5a modify invalid url in plugins_network.md 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: fc7c235f84f76d5d64f25bc802486ecbe87f8b95
Component: engine
 2016-11-25 15:40:51 +08:00
Yanqiang Miao
d22974936d Fix some syntax error 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: 18724726c24728c0dd2bdb4981254a100568185f
Component: engine
 2016-11-25 10:03:28 +08:00
Daniel Nephin
3ecec6e350 Allow hostname to be updated on service. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 1c65cb6657f1288d6a7e93e0015bba68e6d374cd
Component: engine
 2016-11-24 15:44:35 -05:00
Vincent Demeester
187f270db7 Merge pull request #28794 from yongtang/28786-docs-network-ls-dangling 
Update docs of `docker network ls --filter`
Upstream-commit: 03ba9a4922237cde481249fb5d58ec3c26a22b47
Component: engine
 2016-11-24 19:16:57 +01:00
Justin Cormack
50e0ca5a47 Merge pull request #28804 from bfirsh/better-service-network-overlay-error-message 
Improve error when connecting service to network
Upstream-commit: 8602d97835a1cb99943ca22c76d147944953f86a
Component: engine
 2016-11-24 09:06:51 -08:00
Yong Tang
6bc43aa829 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>
Upstream-commit: 2510f254eea58788c1a98987db35294beb839bb4
Component: engine
 2016-11-24 08:14:36 -08:00
Justin Cormack
1e88e0afbe Merge pull request #28803 from ijc25/check-config-legacy-vsyscall 
check-config check for LEGACY_VSYSCALL_* options
Upstream-commit: 82c858c8b6d631c34377e201eed18c1473bbaba7
Component: engine
 2016-11-24 08:10:27 -08:00
Vincent Demeester
20b421de44 Merge pull request #28772 from yongtang/28769-checkpoint-id-name-check 
Restrict checkpoint name to prevent directory traversal
Upstream-commit: ab397c95e6b872dc7575c693ea4dbd0041ef547b
Component: engine
 2016-11-24 17:09:01 +01:00
Vincent Demeester
0026f3bb52 Merge pull request #28802 from yuexiao-wang/fix-cli-typo 
Add options for docker plugin enable and fix some typos
Upstream-commit: 7aae360c413162d0886170a096b80a9a9e937c9e
Component: engine
 2016-11-24 17:03:56 +01:00
yuexiao-wang
7de409be5f Add options for docker plugin enable and fix some typos 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 9e414bfa6b26bf919fc7ffbf0cf87814043b328b
Component: engine
 2016-11-25 04:07:06 +08:00
Ben Firshman
64b693348d 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>
Upstream-commit: 70acb89fa2e889393d33664bc780cf116795f3e4
Component: engine
 2016-11-24 14:43:24 +00:00
Justin Cormack
08f496b922 Merge pull request #28800 from lixiaobing10051267/masterState 
Fix some output information for container test
Upstream-commit: 0f79746f3d2aa7b13ed2e527279791cfe701363e
Component: engine
 2016-11-24 06:21:07 -08:00
Sebastiaan van Stijn
92d40c923d Merge pull request #28602 from dattatrayakumbhar04/nw-connect-paused-container-doc 
28600: Docs: network connect for container in Created/Stopped state
Upstream-commit: b3687bdcdc9e52a1cc154648262c69939d8633df
Component: engine
 2016-11-24 15:04:53 +01:00
lixiaobing10051267
0898ad43d6 Fix some output information for container test 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 92ee5a5d3aaefe2fc3b800de67d2ff0acd6a8aae
Component: engine
 2016-11-24 20:01:00 +08:00
Ian Campbell
ced837f499 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>
Upstream-commit: 163db04452fe399fec940a926733915e7cf90062
Component: engine
 2016-11-24 11:39:05 +00:00
Yanqiang Miao
475c963e9d 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>
Upstream-commit: 52fd6e46645de098d803bfc510c4c24af1099def
Component: engine
 2016-11-24 09:24:29 +08:00
Sebastiaan van Stijn
8d1d4dee5b Merge pull request #28757 from minamijoyo/fix-broken-markdown-in-changelog 
Fix broken markdown in CHANGELOG.md
Upstream-commit: e47ca825d18655851118b12f912ff38bbf285768
Component: engine
 2016-11-24 02:05:03 +01:00
Victor Vieux
af76bb22e4 Merge pull request #28773 from dnephin/exit-status 
exit with status 1 if help is called on an invalid command
Upstream-commit: 32229914c736a6b9f13d1eff5330304f2a39282f
Component: engine
 2016-11-23 15:13:29 -08:00
John Howard
b3ff5acf26 Merge pull request #28667 from Microsoft/jjh/env-case-sensitive 
Windows: Case insensitive env vars
Upstream-commit: f93c04d1ed8bfe21d3aa962ed81ebaaf19d60451
Component: engine
 2016-11-23 14:40:16 -08:00
Victor Vieux
c17df6c51f support src in --secret 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: f70470b71e519012e91137a2512f40d5bb8d18af
Component: engine
 2016-11-23 14:30:57 -08:00
John Howard
2c0a815816 Windows: Update TP5 refs in run_test.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 38faf6e04377e063b54da1f610802a54a88371d0
Component: engine
 2016-11-23 14:28:06 -08:00
Alexander Morozov
31a831b744 Merge pull request #28777 from Microsoft/jjh/fixtypo-bin-mounts 
Fixes typo 'bin-mounts'
Upstream-commit: 6b12887c3e096affa2adef0736865b46c74d6c51
Component: engine
 2016-11-23 14:04:03 -08:00
John Howard
6e9dda554f Fixes typo 'bin-mounts' 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c8c1dfbaf3d4548bbf094c31ccaaf6858b33e6e0
Component: engine
 2016-11-23 14:01:57 -08:00
Vincent Demeester
ccbfa9c95a Merge pull request #28675 from dnephin/no-swarmmode-error-on-deploy 
Better error message on stack deploy when not a swarm manager
Upstream-commit: 205291c5f31eb0732aeb04c0489a6b6814afb905
Component: engine
 2016-11-23 22:47:13 +01:00
Yong Tang
154b3f0e4f 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>
Upstream-commit: c90ec0517544e7d054d79f71f4d24d9ebbad7408
Component: engine
 2016-11-23 13:23:07 -08:00
John Howard
f4499025ce Windows: Case insensitive env vars 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b2049a84dee35308ca8c4837ccb9359f57808f45
Component: engine
 2016-11-23 12:57:33 -08:00
Victor Vieux
f55bac29b6 Merge pull request #28760 from ehazlett/carry-28576 
Update Secret Command help (carry #28576)
Upstream-commit: ae64cae74e387f77b5d5a7b13d1abf0e084112b4
Component: engine
 2016-11-23 12:29:55 -08:00
dattatrayakumbhar04
57d2ffce2e 28600: Docs: network connect for container in Created/Stopped state 
Signed-off-by: dattatrayakumbhar04 <dattatraya.kumbhar@gslab.com>
Upstream-commit: 16c9cdad6fd7c78600e795cad03ec8b34cba0371
Component: engine
 2016-11-23 20:20:37 +00:00
Daniel Nephin
32d2829610 exit with status 1 if help is called on an invalid command. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: bb7601a3ffdc78bbe7efe7e77a196e09cf3607c7
Component: engine
 2016-11-23 15:13:58 -05:00
Alexander Morozov
eca4c813dd Merge pull request #28728 from aluzzardi/swarmkit-revendor-53fcdeba083627b1a2616612a103019b73c6d5ce 
revendor swarmkit to 53fcdeba083627b1a2616612a103019b73c6d5ce
Upstream-commit: 1640bb23b1127b76c4f0bf97bb265238b7574da9
Component: engine
 2016-11-23 09:24:23 -08:00
Daniel Nephin
64466e9e79 Better error message on stack deploy against not a swarm. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c72daf953aaa8c7c8cbe60a103700d3b1d56c50d
Component: engine
 2016-11-23 12:15:11 -05:00