Commit Graph

31631 Commits

Author SHA1 Message Date
1d2339b8c6 Merge pull request #28857 from miaoyq/fix-a-description-of-docker-run
Fix description and link  of 'docker run [-a]'
Upstream-commit: d5dee554ea642a33f2f790f56e48d5041f65b216
Component: engine
2016-11-28 10:31:06 +09:00
30dcf3c67c Merge pull request #28866 from albers/completion-service--host
Add bash completion for `docker service {create,update}` host options
Upstream-commit: 9439b2b7e2236df3152567fdc8748cd1fc7ae252
Component: engine
2016-11-27 20:22:02 -05:00
8b597c0ef3 Add bash completion for docker service {create,update} host options
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: f3b7f40aafb009a3779e94ec9b2a8de1e0ce96bc
Component: engine
2016-11-27 05:08:35 -08:00
ec37dc533e Add zsh completion for 'docker stack' subcommand
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 1e0c612f848a3fa5bfbcf347e5f91512ae9c4773
Component: engine
2016-11-27 13:59:48 +01:00
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
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
a0f0d908cc Add bash completion for plugin API
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ecb707cb0f0ebb50fb1b90f4ab3c4ae611925ed2
Component: engine
2016-11-26 11:04:55 -08:00
9b5ea3c1b2 Add bash completion for docker stack
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 16494a81f98632a67a9d10ee7892fe25a51d3de4
Component: engine
2016-11-26 10:45:07 -08:00
636e8b8148 Fix a description of 'docker run [-a]'
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: 08ff4f427e5ab6b597348661e602cd2a335e0aa0
Component: engine
2016-11-26 22:56:29 +08:00
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
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
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
26510bfcf5 Merge pull request #28855 from YuPengZTE/devMD023
fix the typo
Upstream-commit: 2f5dbd63b097fe0c25d1fdbb57f094dca0f01701
Component: engine
2016-11-26 14:31:54 +01:00
b072d0bd96 Merge pull request #28856 from sdurrheimer/zsh-completion-service-update-hostname
Add zsh completion for 'docker service update --hostname'
Upstream-commit: 41b76877587cce6fa901594e09a527d4d0170164
Component: engine
2016-11-26 14:30:07 +01:00
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
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
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
8f7e98f07f cli: remove --mount from docker run
This commit reverts 273eeb813c1db0f42c2ad5e053972eeb00907568 (#26825).
For the discussion so far, please refer to #28527.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: e6d9b7de649c0b3b59c7d9b698af1c58f6dce289
Component: engine
2016-11-26 04:55:28 +00:00
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
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
281796c22d Merge pull request #28841 from justincormack/sandbox-error
Fix grammar on error message
Upstream-commit: 7dcd7b8ec5ddb49c812be3bc19e4039e52646f8c
Component: engine
2016-11-25 11:54:36 -05:00
a2f0c8aa51 Modify reponame to PLUGIN and fix some typos
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: c394034f5978862b75770a036364f806bbcd8920
Component: engine
2016-11-25 23:09:46 +08:00
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
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
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
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
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
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
8013774cb8 Modify the link for config.json
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 4e970c1e5a2b16f9408f530037e65595810cc5d7
Component: engine
2016-11-25 18:33:04 +08:00
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
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
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
de8cf74e0d Merge pull request #28818 from miaoyq/fix-some-syntax-err
Fix some syntax error
Upstream-commit: b8e3a28d6510bb71a11311d1b81b2ca546ea9afc
Component: engine
2016-11-24 22:26:25 -05:00
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
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
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
dc8295e701 Add some adjectives to the namesgenerator
Because .. `hardcore_hamilton` and `inspiring_murdock`

https://twitter.com/swiftonsecurity/status/801195049165799424

Also replacing adjectives that could be interpreted as
refering to body size, (mental) health, intoxication.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 169b4d92a15a08683e3f3afe7f278d9a0199153a
Component: engine
2016-11-24 18:38:04 +01:00
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
2584c5e68f Optimize the unit test for restartmanager
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 0a0bbab81d30a22e1c60e17c57be09df1541ee9c
Component: engine
2016-11-25 00:21:58 +08:00
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
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
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
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
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
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
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
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
c3ca7189dc Fix a error of the function 'CopyMessage' in 'daemon/logger/logger.go'
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

add a test for 'CopyMessage'

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

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: 3b82eac65fc365a89f64ccaba98f8f3b5c9c5787
Component: engine
2016-11-24 20:08:54 +08:00
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
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