574f281ca0
Merge pull request #26224 from q384566678/test-zhou
...
Modify rename function use tips
Upstream-commit: 061cc417591217c4bcf735267c2de18f2a8189c0
Component: engine
2016-09-08 11:22:21 -07:00
77b48e7428
Merge pull request #26252 from leslau/master
...
Fixed custom daemon options on systemd docs still using -H fd://
Upstream-commit: 7baa09faa02ad93dcb0e103abde3c45862fc903c
Component: engine
2016-09-08 17:15:13 +02:00
774225b30e
Merge pull request #26228 from lixiaobing10051267/masterPluginRm
...
check inconsistant command in docs/reference/commandline
Upstream-commit: e96c0fafa0465e7d1a3a12fda820c16d0449f814
Component: engine
2016-09-08 11:09:18 -04:00
33561ab95c
Merge pull request #24586 from farcaller/gcplogs
...
Added optional flags to init gcp logger metadata
Upstream-commit: 5be6ccc433e8c9207c67087304dfb72fa00ba544
Component: engine
2016-09-08 13:47:48 +10:00
2280ed4544
Merge pull request #26256 from mstanleyjones/rewrite_understanding_docker
...
Rewrites to Understanding Docker topic for clarity
Upstream-commit: 426a0af0759798d8e3332b38236ee40df6d14798
Component: engine
2016-09-07 11:36:58 -07:00
5133a883a8
Rewrites to Understanding Docker topic for clarity
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 12b740b65c88f6225241fe9a73575ec083ddba5d
Component: engine
2016-09-07 11:02:03 -07:00
e42ce8aa21
Merge pull request #26156 from mstanleyjones/24905_swarm_noun_usage
...
Sanitize uses of Swarm as a proper and improper noun (Fixes #24905 )
Upstream-commit: 6f0502b89b29a7d23b02363d02104ec531a36e4a
Component: engine
2016-09-07 10:38:59 -07:00
a8af3835c4
Merge pull request #26269 from yuexiao-wang/remove-option
...
Remove the option for the command service rm
Upstream-commit: 20607e2cc20662453226938e4fe0d7ca40fc6ae7
Component: engine
2016-09-07 11:31:11 -04:00
64292ad8e2
Merge pull request #26218 from frosforever/fix_run_reference_typo
...
Correct typo in run reference docs that use the create command
Upstream-commit: e73e37f11206a346d2a552c5d133112cd103d562
Component: engine
2016-09-07 22:18:26 +10:00
94b406a933
rectify some response information while execute ifconfig in container
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 97bbfc353450602b358dfa6231faf240744b9967
Component: engine
2016-09-07 13:19:46 +08:00
4de3f43e65
remove some incorrect bash symbols
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 2d1d4684f0fc752aae7e41af03a0f1589f11ee00
Component: engine
2016-09-07 11:44:54 +08:00
0908488188
Merge pull request #26288 from sfsmithcha/add_tls
...
author merge: addressed @diogomonica ' remark: add how pki works topic
Upstream-commit: 75c36bcc64a5597919a16a7d43463f7e7c5e1499
Component: engine
2016-09-06 10:41:46 -07:00
565ec12cc7
add how pki works topic
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 5ca3e6e61f5537fa637de9436881402a929bea77
Component: engine
2016-09-06 10:39:52 -07:00
656be9ef36
Merge pull request #26294 from petrsvihlik/updated-windows-mounting-example
...
Updated Windows mounting example
Upstream-commit: 368a27a8d80337918d465c8c98100a4e22d9ef1a
Component: engine
2016-09-06 09:05:50 -07:00
773fd0e328
Merge pull request #26212 from rhvgoyal/xfs-enospc
...
devmapper: Set xfs max_retries to 0 upon ENOSPC
Upstream-commit: 0d03c060c7e6800e60833c4462b917ee9b081440
Component: engine
2016-09-06 09:03:09 -07:00
8226c5b8ed
Merge pull request #26307 from AkihiroSuda/fix-doc-26291
...
fix docs about `sudo docker login`
Upstream-commit: da763602afbb25ea4428e1d608af5ee017a0b94e
Component: engine
2016-09-06 17:47:46 +02:00
56f38b6496
Add response to swarm/init example ( fixes #25625
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: a2a0a03e2b801545b2e3fb9e8476c76370da9175
Component: engine
2016-09-06 08:39:53 -07:00
87b65ede10
Merge pull request #26293 from lixiaobing10051267/masterDockerAttach
...
fix the wrong option info while specifying the command with the "--help"
Upstream-commit: d8e151535017b4bb4ee5aa8281f1b9bb7bffa397
Component: engine
2016-09-06 15:44:44 +02:00
1092bf17b8
Merge pull request #26313 from yongtang/26312-network-ls-help-output-volume
...
Fix incorrect help output in `docker network ls`
Upstream-commit: 1325cde252cd3f117c56a51fd2292194e9f68631
Component: engine
2016-09-05 19:13:09 +02:00
c53f181a9b
Fix incorrect help output in docker network ls
...
As is raised in 26312, in `docker network ls`, the help output was
mistaken to `volume names`:
```
-q, --quiet Only display volume names
```
This fix changes the help output to:
```
-q, --quiet Only display network IDs
```
This fix also updates the documentation in:
`docs/reference/commandline/network_ls.md`
This fix fixes 26312.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: b9e46235fadc6b390e2c04c44b6a865e4ea97cb8
Component: engine
2016-09-05 08:24:22 -07:00
a5e3c6ff62
Merge pull request #26292 from lixiaobing10051267/masterDockerPull
...
modify output info for docker pull centos
Upstream-commit: 175188d8b0eb976cceb6c46de439186eec98e40e
Component: engine
2016-09-05 15:44:01 +02:00
f4b10db50e
docs: mention NFS support for contiv volume plugin
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: faaccf26e3936fd34c049267a17b6a34e06a2b4d
Component: engine
2016-09-05 12:38:50 +03:00
aabe996fb1
Merge pull request #26236 from yuexiao-wang/remove-h-option
...
Remove -h option for docker cli
Upstream-commit: 01fe5639bc46ea6cc2efe7b9333bb4d1abb1894b
Component: engine
2016-09-05 09:52:18 +02:00
c84cf3cf3a
fix docs about sudo docker login
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: d6007b4db0c2dc788fc0b1d2e2c5e95a5fa0701f
Component: engine
2016-09-05 04:44:18 +00:00
509edc829c
Merge pull request #26302 from vdemeester/health_status-in-event-docs
...
Add health status as action on events documentations
Upstream-commit: b468df9eac16d73c9b8e4853411df1fafea37d1f
Component: engine
2016-09-05 10:03:14 +10:00
f1e49b9e9a
Merge pull request #26245 from dbdd4us/master
...
add volumes, networks, nodes and services into label doc
Upstream-commit: 384de833c0f7e20d6a36b6786d1f2e2e67b90d2f
Component: engine
2016-09-05 10:02:35 +10:00
5599c8776d
Add health status as action on events documentations
...
This was missing from the docs for 1.12.0.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: fb8b6438f265532ec47e001b2739ed614b47f3a0
Component: engine
2016-09-04 18:01:57 +02:00
9e0fb207fb
fix the wrong info while specifying the command with the "--help"
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 2626d341e7b39d5d6182d8af0cec425420f8f176
Component: engine
2016-09-04 04:26:56 +08:00
8c44f51734
Updated Windows mounting example
...
Signed-off-by: Petr Švihlík <svihlik.petr@gmail.com >
Upstream-commit: ea0d7b1b3b4d89e7601cb93740fa9ee0e000dd9f
Component: engine
2016-09-03 18:23:43 +02:00
4e526a616e
modify output info for docker pull centos
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 6becc1a5774e391a3dcade645cdeff46577bf6fa
Component: engine
2016-09-03 22:27:18 +08:00
7f24fbc8dc
Merge pull request #26271 from AkihiroSuda/fix-service-create-doc
...
update docs/reference/commandline/service_create.md
Upstream-commit: 1a04d7b1e13ffe725a5310b55e83ae60b1ab7e55
Component: engine
2016-09-02 12:39:31 +02:00
c789417f1c
update docs/reference/commandline/service_create.md
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: aa479616822e4e6ecd9d90425f11f76cd26ce70d
Component: engine
2016-09-02 09:59:20 +00:00
64ea42838d
Remove the option for the command service rm
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 1016cbb64243ca8adc9444779e6e4717a4541ef7
Component: engine
2016-09-02 17:23:59 +08:00
e92f9d7cac
Merge pull request #24510 from runcom/new-seccomp-format
...
New seccomp json format
Upstream-commit: 9d71cba5f09825cdafe04fdb0243cc30bf887b68
Component: engine
2016-09-02 09:14:01 +01:00
96ee703a5f
Remove -h option for docker cli
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 8ad8245ee39d731af7c79e722435c32f051387f7
Component: engine
2016-09-02 11:46:49 +08:00
400f4d8a48
Fixed custom daemon options on systemd docs still using -H fd://
...
Signed-off-by: Luciano Mores <leslau@gmail.com >
Upstream-commit: c6fae2d12ff9bd51bce9733cd6636f618b589fb5
Component: engine
2016-09-01 17:38:25 -03:00
9d092e464e
Merge pull request #26241 from YuPengZTE/devNote
...
The first letter of “docker“ is small
Upstream-commit: b14f29dfbd527fd2dbd05e024f760939aba6642c
Component: engine
2016-09-01 20:53:07 +02:00
f9ef0edaad
devmapper: Provide a knob dm.xfs_nospace_max_retries
...
When xfs filesystem is being used on top of thin pool, xfs can get ENOSPC
errors from thin pool when thin pool is full. As of now xfs retries the
IO and keeps on retrying and does not give up. This can result in container
application being stuck for a very long time. In fact I have seen instances
of unkillable processes. So that means once thin pool is full and process
gets stuck, container can't be stopped/killed either and only option left
seems to be power recycle of the box.
In another instance, writer did not block but failed after a while. But
when I tried to exit/stop the container, unmounting xfs hanged and only
thing I could do was power cycle the machine.
Now upstream kernel has committed patches where it allows user space to
customize user space behavior in case of errors. One of the knobs is
max_retries, which specifies how many times an IO should be retried
when ENOSPC is encountered.
This patch sets provides a tunable knob (dm.xfs_nospace_max_retries) so
that user can specify value for max_retries and tune xfs behavior. If
one sets this value to 0, xfs will not retry IO when ENOSPC error is
encountered. It will instead give up and shutdown filesystem.
This knob can be useful if one is running into unkillable
processes/containers issue on top of xfs.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: 4f0017b9ad7dfa2e9dcdee69d000b98595893e60
Component: engine
2016-09-01 11:38:09 -04:00
7a15c4b5ad
add volumes, networks, nodes and services into label doc
...
Signed-off-by: dbdd <wangtong2712@gmail.com >
Upstream-commit: 30404950c49986291c02e1f9e6f0fce3cb54e09b
Component: engine
2016-09-01 20:25:19 +08:00
009555a4b2
New seccomp format
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 5ff21add06ce0e502b41a194077daad311901996
Component: engine
2016-09-01 11:53:07 +02:00
4fbbab7cfa
The first letter docker is small
...
Upstream-commit: e0e62874bb9bcdaf6418e0d1728c9170527b3c3a
Component: engine
2016-09-01 17:03:01 +08:00
c222d18573
Modify rename function usage
...
Signed-off-by: zhouhao <zhouhao@cn.fujitsu.com >
Upstream-commit: 61c8b3380fe35fbd021a3efc1f180c1636d08a27
Component: engine
2016-09-01 14:48:02 +08:00
6be9adf324
check inconsistant command in docs/reference/commandline
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: efe39448f76de4b3eab4feb7235f4f135b987dae
Component: engine
2016-09-01 12:21:52 +08:00
2d42e16cb9
Correct typo in run reference docs that use the create command
...
Signed-off-by: Yosef Fertel <yfertel@gmail.com >
Upstream-commit: 84196adf3d8bf174e269018a3a0b87b5a4afd1ab
Component: engine
2016-08-31 18:09:43 -04:00
c03a13f697
Merge pull request #26139 from yuexiao-wang/fix-link
...
Modify link for hub and registry
Upstream-commit: ad6f5a49d5f24f8b64def11176b6c8df162d839f
Component: engine
2016-08-31 16:37:50 +01:00
5645fa8e4e
Merge pull request #26182 from yuexiao-wang/add-options
...
Miss the options in some commands
Upstream-commit: ba23bf202adab9f4b8c9dcaffeddfd130674fb15
Component: engine
2016-08-31 14:45:42 +02:00
f9a92ea425
Merge pull request #26192 from lixiaobing10051267/masterPluginInspect
...
make command "docker plugin inspect" complete
Upstream-commit: cf699ad427084076c7ca1ea5fbab78cd77597f2a
Component: engine
2016-08-31 14:42:03 +02:00
a2a77498bf
Merge pull request #26190 from lixiaobing10051267/masterNetworkCreate
...
provide actual command format for docker network create
Upstream-commit: 37fd1416daac0b3963dc812a820b844e9e854e59
Component: engine
2016-08-31 14:41:49 +02:00
33fbdef4b0
Merge pull request #26187 from albers/docs-volume-create-fix
...
Fix argument order for docker create in tutorial
Upstream-commit: 670eaa71a0629323327cb5604c44abf14890d4b4
Component: engine
2016-08-31 14:41:22 +02:00
4b86079014
Merge pull request #26185 from yuexiao-wang/update-docs
...
Update description for docker plugin inspect
Upstream-commit: 0414a2c1a960832cc6d3df8641f23952c3700084
Component: engine
2016-08-31 14:41:03 +02:00
