Commit Graph

5685 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
3bd4612aaf Add --mount syntax documentation to CLI reference
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit eb3a01eb432473beae968a0c9f3817af8b7a7d53)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:25:31 +02:00
YuPengZTE
f81e4e8d57 The hit is missed
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
(cherry picked from commit ced272984157e277523a942505435aa392913ac4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:25:24 +02:00
pestophagous
1edf705917 Fix typo in docs. s/methodoligies/methodologies/
Signed-off-by: K Heller <pestophagous@gmail.com>
(cherry picked from commit 191adcfb637ea1b52d2da9a75e4e1e4938d9550c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:25:15 +02:00
Sebastiaan van Stijn
9a207a7eb7 Synchronize API docs
This synchronizes changes between API versions, and:

- applies e0a552504e64192946c86d3bdd517ae7b3af348f to
  older versions of the documentation
- applies a2a0a03e2b801545b2e3fb9e8476c76370da9175 to
  API version 1.25
- syncs some minor differences

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 53b1dcb25ca937c61bd47a29ba7be6e68abc25a5)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:25:09 +02:00
Sebastiaan van Stijn
ac1eb9edd0 Fix service and tasks API documentation
The documentation contained some outdated information
on these endpoints.

This change fixes those parts of the documentation

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d69409fd43e73829209315de79abf79000c4c720)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:25:02 +02:00
lixiaobing10051267
f9f6145003 add bash symbol for docker network inspect
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
(cherry picked from commit 7c3a26db166bf4d618ae414470f6bed7160f1371)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:24:55 +02:00
Alessandro Boch
e289fc155a Fix mtu option in documentation
Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit e74a937b00af567b655c93224cc6a514f54e2b38)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:24:46 +02:00
YuPengZTE
8ae21d6d4d The etc and dot is seprated
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
(cherry picked from commit bd914ff5a31b1b39bdd9c0fbacf76c65c2b1e842)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:24:38 +02:00
Josh Bodah
bcc70e52eb Remove extra paren in run --link docs
Signed-off-by: Josh Bodah <jb3689@yahoo.com>
(cherry picked from commit 484fbe236dcab9fb5b8d48844a8cdc9d614e32e9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:24:29 +02:00
Sebastiaan van Stijn
c84d8b8360 Use "sudo" for dockerd examples
Because we standardize on using a non-privileged
prompt (`$`) instead of `#`, replacing the
examples to use `sudo` instead to indicate
this has to be run as root.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 87b174080bd8b1b9ea2bbfad8ef35a4c0dfe8ad4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:23:30 +02:00
Sebastiaan van Stijn
ae9b46dbd0 Add link to logging drivers reference
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 7ca02f86de2ceef980cad98faefc15cbc628c91a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:17:53 +02:00
Antonio Murdaca
7fad9da9f2 docs: reference: api: clarify pull all tags
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit 03a8b6798d030a952e85f15208aeea1215e3f801)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:17:45 +02:00
Sebastiaan van Stijn
a8aaf5bfad Synchronize push reference with man page
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit dddea689ab45ce146e6ac3a1199235e1f36ffe29)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:17:37 +02:00
Sebastiaan van Stijn
c6ba6498b3 Restore missing "format" example
The "format" example got lost during the
rewrite of the documentation for Cobra. This
restores the missing example.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit edbb8fb86d7d0b715adc15415f0cb187433092a5)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:17:29 +02:00
Yong Tang
af46f0242e Fix a couple of issues in Get Started docs
This fix fixes a couple of issues in Get Started docs' Step Four:
1. `Sending build context to Docker daemon 158.8 MB` should be
`Sending build context to Docker daemon 2.048 kB` as there is only
one Dockerfile for context.

2. There are only 3 steps altogether in stead of 4 steps as
`RUN apt-get -y update && apt-get install -y fortunes` is one step.
So `Step 3 : RUN apt-get install -y fortunes` should be removed and
`Step 4 : CMD /usr/games/fortune -a | cowsay` should be changed to
`Step 3 : CMD /usr/games/fortune -a | cowsay`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit 1cd06fdd1ac5ce1f91291330d9f89679468ce393)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:17:22 +02:00
Sebastiaan van Stijn
c9ce561ac0 Add direct link to event chart image
This adds a direct link to the event chart image
so that the full-resolution image can be "zoomed"
in to.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 86de72fef244b3fe209e5793deb40fb26f5b318e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:17:14 +02:00
Sebastiaan van Stijn
792c545f52 Remove Frugalware installation docs
These docs were outdated, and not actively
maintained. Also, there are no official packages
available for this distribution, so better to
remove it from the documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 9b8b6aa224d0e88bdd27e322ae1c922e3dfcbe12)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:17:06 +02:00
Victor Vieux
cd589e16c8 add some plugin manifest reference doc
Signed-off-by: Victor Vieux <vieux@docker.com>
(cherry picked from commit 44a16acff15b5da3103fd002ad5064cb7b375106)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:16:57 +02:00
lixiaobing10051267
bc97dc1e50 remove some incorrect bash symbols
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
(cherry picked from commit 2d1d4684f0fc752aae7e41af03a0f1589f11ee00)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-29 14:16:46 +02:00
Victor Vieux
1ec9ca1ca6 Merge pull request #26866 from docker/cherry-picks-1.12.2
Cherry picks 1.12.2
2016-09-27 13:33:29 -07:00
Sebastiaan van Stijn
e9c655442a 1.12 Revert "Merge pull request #26030 from yongtang/08252016-doc-docker-create-rm"
This reverts commit 44180a48e9,
as `docker create --rm` is part of docker 1.13, so should
not be in the 1.12 branch

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-27 16:33:53 +02:00
Yong Tang
e892a54fa1 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>
(cherry picked from commit b9e46235fadc6b390e2c04c44b6a865e4ea97cb8)
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-09-26 19:33:52 -07:00
Misty Stanley-Jones
24df982128 Clarify usage of --force when used on a swarm manager
Fixes #26125

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 7b5c3d935a7a99b282f0f859101c887894a0b00e)
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-09-26 19:33:45 -07:00
Misty Stanley-Jones
4da24ca1e3 Set docker_remote_api_v1.25.md to draft in 1.12.x branch
It does not apply to 1.12.x but we are leaving the file in place
to make future cherry-picks easier.

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-16 10:03:13 -07:00
Sebastiaan van Stijn
99ed95cb57 Merge pull request #26526 from lixiaobing10051267/masterSymble
fix some incorrect symbols before executing command
(cherry picked from commit 9e9ba1e1c1235c3bdb7a70a0a9d0c5932d5afe9e)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-16 10:03:13 -07:00
Justin Cormack
787ed27c32 Merge pull request #26496 from riyazdf/trust-sandbox-fix
Use latest version of notary server in trust sandbox docs
(cherry picked from commit 6fafd07282f950799613c2ffc8eac6ff86d48206)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-16 10:03:12 -07:00
Brian Goff
9ec857ad5a Merge pull request #26472 from yongtang/09112016-docker-build-step-0
Fix documentation for `Step 0` to `Step 1` in `docker build`
(cherry picked from commit e41839e8a154f1336b3a995dba3f5912dde7e0fe)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-16 10:03:12 -07:00
Sven Dowideit
f784166e8a Merge pull request #26458 from sfsmithcha/fix_vip_diagram
updates swarm overlay network diagram
(cherry picked from commit ae4582dc28ba33f80f17e2cf47e62e464aac7ec5)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-16 10:03:12 -07:00
Vincent Demeester
0183b3bf8c Merge pull request #26426 from sfsmithcha/carry_pry_25414
Carry pr 25414
(cherry picked from commit e6f76800f5880652382a6f9180bfdefe6aaad577)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-16 10:03:12 -07:00
Sven Dowideit
8f264db3f1 Merge pull request #26306 from deployable/patch-1
Remote API documentation consistancy
(cherry picked from commit 2cce7bf33a1af566670ec0fb2deeff8056b2798d)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-16 10:03:12 -07:00
Michael Crosby
b23bff1d9f Merge pull request #26224 from q384566678/test-zhou
Modify rename function use tips
(cherry picked from commit 061cc417591217c4bcf735267c2de18f2a8189c0)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-16 10:03:12 -07:00
Sebastiaan van Stijn
7c8dc9e6d5 Merge pull request #25817 from sfsmithcha/update_glossary
add swarm mode terms to the glossary
(cherry picked from commit 027e7be3482ff314f22dafcb7a4a2ab26b1a7ad7)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-14 09:48:29 -07:00
Vincent Demeester
c6e7fececb Merge pull request #25719 from eskaaren/master
You can force leave swarm
(cherry picked from commit daf454d8cd6146ef2cb644614301806ef59c58cc)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-14 09:48:23 -07:00
Misty Stanley-Jones
01855d37be Merge pull request #26547 from londoncalling/fix-links-in-overview
fixed on-page links
(cherry picked from commit e08b2f7a082de21f62816ccbb42dedad36d47adb)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-13 16:34:32 -07:00
Misty Stanley-Jones
bf637439e7 Revert "Merge pull request #26236 from yuexiao-wang/remove-h-option"
This reverts commit eea99cd001.

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-12 11:02:09 -07:00
Vincent Demeester
2eb9e80547 Merge pull request #26252 from leslau/master
Fixed custom daemon options on systemd docs still using -H fd://
(cherry picked from commit 7baa09faa02ad93dcb0e103abde3c45862fc903c)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-09 14:45:14 -07:00
Vincent Demeester
eea99cd001 Merge pull request #26236 from yuexiao-wang/remove-h-option
Remove -h option for docker cli
(cherry picked from commit 01fe5639bc46ea6cc2efe7b9333bb4d1abb1894b)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-09 14:44:58 -07:00
Brian Goff
8a56561528 Merge pull request #26228 from lixiaobing10051267/masterPluginRm
check inconsistant command in docs/reference/commandline
(cherry picked from commit e96c0fafa0465e7d1a3a12fda820c16d0449f814)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-09 14:44:37 -07:00
Charles Smith
dc98c76772 Merge pull request #26156 from mstanleyjones/24905_swarm_noun_usage
Sanitize uses of Swarm as a proper and improper noun (Fixes #24905)
(cherry picked from commit 6f0502b89b29a7d23b02363d02104ec531a36e4a)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-09 14:44:29 -07:00
Vincent Demeester
9710d3d9e9 Merge pull request #25896 from raksonibs/fix/docs_step_6
Email deprecation for step 6 of tutorial
(cherry picked from commit 4e4ebbe34040f557775b59d111a8127f1f7df9a2)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-09 14:44:22 -07:00
yuexiao-wang
0d800e9a37 clean up the run.md in reference
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
(cherry picked from commit dd02815a2673794cd94f3225c5517d9f30d09d56)
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-09 14:44:09 -07:00
Sven Dowideit
be71b62acf Merge pull request #26431 from mstanleyjones/2016.09.08-engine-docs-updates
2016.09.08 engine docs updates
2016-09-09 21:43:38 +10:00
Vincent Demeester
c63cdcd948 Merge pull request #26362 from lixiaobing10051267/masterIfconfig
rectify some response information while execute ifconfig in container
(cherry picked from commit 0ebb18102f376ee42ecc97d159842737ff73568d)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-08 14:34:00 -07:00
Charles Smith
a8c297c254 Merge pull request #26256 from mstanleyjones/rewrite_understanding_docker
Rewrites to Understanding Docker topic for clarity
(cherry picked from commit 426a0af0759798d8e3332b38236ee40df6d14798)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-08 14:34:00 -07:00
Sven Dowideit
bf7d335513 Merge pull request #26218 from frosforever/fix_run_reference_typo
Correct typo in run reference docs that use the create command
(cherry picked from commit e73e37f11206a346d2a552c5d133112cd103d562)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-08 14:34:00 -07:00
Vincent Demeester
11330bf048 Merge pull request #26307 from AkihiroSuda/fix-doc-26291
fix docs about `sudo docker login`
(cherry picked from commit da763602afbb25ea4428e1d608af5ee017a0b94e)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:31:59 -07:00
Vincent Demeester
bbf49348e2 Merge pull request #26293 from lixiaobing10051267/masterDockerAttach
fix the wrong option info while specifying the command with the "--help"
(cherry picked from commit d8e151535017b4bb4ee5aa8281f1b9bb7bffa397)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:31:03 -07:00
Vincent Demeester
55f95dd7e8 Merge pull request #26292 from lixiaobing10051267/masterDockerPull
modify output info for docker pull centos
(cherry picked from commit 175188d8b0eb976cceb6c46de439186eec98e40e)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:30:10 -07:00
Vincent Demeester
95bc4519d2 Merge pull request #26241 from YuPengZTE/devNote
The first letter of “docker“ is small
(cherry picked from commit b14f29dfbd527fd2dbd05e024f760939aba6642c)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:28:39 -07:00
Vincent Demeester
a42e2a0e42 Merge pull request #26192 from lixiaobing10051267/masterPluginInspect
make command "docker plugin inspect" complete
(cherry picked from commit cf699ad427084076c7ca1ea5fbab78cd77597f2a)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:18:44 -07:00