73717df772
Merge pull request #25817 from sfsmithcha/update_glossary
...
add swarm mode terms to the glossary
Upstream-commit: 027e7be3482ff314f22dafcb7a4a2ab26b1a7ad7
Component: engine
2016-09-13 12:08:32 +02:00
afc1ccd008
Merge pull request #25466 from justincormack/deprecate-maintainer
...
Begin process of deprecating MAINTAINER
Upstream-commit: 4d187df277153bf704868d9a67b1e4fa29abf873
Component: engine
2016-09-13 12:07:04 +02:00
9ac54a66eb
Merge pull request #26489 from yuexiao-wang/update-exec
...
update option for docker exec
Upstream-commit: 0c90f777b745263deb4be55250ac3d19ddd91cf2
Component: engine
2016-09-13 11:16:22 +02:00
3fe1e84cec
Merge pull request #26496 from riyazdf/trust-sandbox-fix
...
Use latest version of notary server in trust sandbox docs
Upstream-commit: 6fafd07282f950799613c2ffc8eac6ff86d48206
Component: engine
2016-09-12 23:56:41 +01:00
7d2bc2d40d
Use latest version of notary server in trust sandbox docs
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 40f823ccd8ce0c07a27a287f665b4cc0c0084569
Component: engine
2016-09-12 09:42:12 -07:00
23e3dc0dcd
Merge pull request #26472 from yongtang/09112016-docker-build-step-0
...
Fix documentation for `Step 0` to `Step 1` in `docker build`
Upstream-commit: e41839e8a154f1336b3a995dba3f5912dde7e0fe
Component: engine
2016-09-12 09:08:35 -04:00
4e9a7b27fc
update option for docker commands
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 7084aa24c77bde6ed46b2a0b727d049b86ecffec
Component: engine
2016-09-12 19:10:45 +08:00
ec2041215e
Merge pull request #26306 from deployable/patch-1
...
Remote API documentation consistancy
Upstream-commit: 2cce7bf33a1af566670ec0fb2deeff8056b2798d
Component: engine
2016-09-12 10:52:30 +10:00
4472545a05
Merge pull request #26458 from sfsmithcha/fix_vip_diagram
...
updates swarm overlay network diagram
Upstream-commit: ae4582dc28ba33f80f17e2cf47e62e464aac7ec5
Component: engine
2016-09-12 10:11:08 +10:00
70a2fe1d7b
Fix documentation for Step 0 to Step 1 in docker build
...
The indexing of steps in the output of `docker build` starts with `Step 1`.
However, there are several places in the docs that start with `Step 0`.
This fix addresses the issue and changes `Step 0` to `Step 1` (and subsequent steps).
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 256dbe4b752ba1fde88e6fad76e3a6b08e4a8816
Component: engine
2016-09-11 10:52:40 -07:00
c47747e33c
Merge pull request #26426 from sfsmithcha/carry_pry_25414
...
Carry pr 25414
Upstream-commit: e6f76800f5880652382a6f9180bfdefe6aaad577
Component: engine
2016-09-10 11:50:28 +02:00
f9b7ffdb90
Keep headings consistant in API documentation
...
The "Stream details" sections are currently a part of the Status codes list.
This change moves them out to the same level as other surrounding sections.
Use () for a paramaters
Remove query param from end point heading
Signed-off-by: Matt Hoyle <matt@deployable.co >
Upstream-commit: e0a552504e64192946c86d3bdd517ae7b3af348f
Component: engine
2016-09-10 12:27:41 +10:00
0b9d5f508c
carries and closes 25414
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: e7e85c7e067167f6ed14866b66afa461d2de32ba
Component: engine
2016-09-09 15:57:53 -07:00
c4f625455b
updates swarm overlay network diagram
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 48f3aa7805fc935d1c07f9c697edcb6b274252da
Component: engine
2016-09-09 15:18:53 -07:00
5ae8996c81
add swarm mode terms to the glossary
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 498f18de26cb8142323c64683699d9e6f10946ea
Component: engine
2016-09-09 11:18:30 -07:00
3ad3cbeebe
Update service_create.md
...
More info on endpoint setting, and service discovery on swarm mode overlay network.
Signed-off-by: Richard Mathie <richard.mathie@amey.co.uk >
Upstream-commit: 21a9c64b77bd10969dde7376060d5750c6b65aac
Component: engine
2016-09-08 12:11:48 -07:00
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
