Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit f0230049f0afd318217c60ebe486aab3b54538fd)
Signed-off-by: Tibor Vass <tibor@docker.com>
update intro to say there are four things to consider
(cherry picked from commit ce2ca236db87f8f580cb29be27b4f0b5341af0ca)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit 7cee444f8b90d435cc3358e2f510d0614e4e02fd)
Signed-off-by: Tibor Vass <tibor@docker.com>
Add delete and update API documentation
(cherry picked from commit 2f167a760904f5cf4f6250a55aa8f735fba74594)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Conflicts:
docs/reference/api/docker_remote_api_v1.25.md
(cherry picked from commit ee59531352e3d98d4cc167733e0ffb99528dbd22)
Signed-off-by: Tibor Vass <tibor@docker.com>
Update example output for node inspect
(cherry picked from commit 80c49d1e5206eabf314069c262f7f643adf021e1)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit adf552821a35361b5c975189d6fd5c26f700e86a)
Signed-off-by: Tibor Vass <tibor@docker.com>
add force remove to admin guide, clean up usage of Raft, cluster -> s…
(cherry picked from commit 59b03240b17d5c1fdd18e629e614dc5cffc6c536)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Conflicts:
docs/swarm/admin_guide.md
(cherry picked from commit 0f65b6b1377335cd343d248e3dc47d1ea75eb166)
Signed-off-by: Tibor Vass <tibor@docker.com>
fix typo, change sample cert expiry value
(cherry picked from commit e62b9450136595ac73b4fd0de766d072c1a6954a)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit f72a1eb6bed1684bb3f282227ae761c6e0532714)
Signed-off-by: Tibor Vass <tibor@docker.com>
Fix typo in run command documentation
(cherry picked from commit 0af3ca6933cccae7fc12cd76dd2ec858bd469eb8)
Signed-off-by: Tibor Vass <tibor@docker.com>
Remove git conflict markers in docs/reference/commandline/swarm_join.md
(cherry picked from commit 49819165460f12606cb96fc0e579cb4019e407da)
Signed-off-by: Tibor Vass <tibor@docker.com>
minor nit typo in opensl(openssl) genrsa -out delegation.key 2048
(cherry picked from commit 4191b786c5a1741038561f79f7fb2790bcbd2b5a)
Signed-off-by: Tibor Vass <tibor@docker.com>
Fix Markdown formatting in API docs
(cherry picked from commit 66671d4ec29d7ccbd991399b8b98705e57b6a3eb)
Signed-off-by: Tibor Vass <tibor@docker.com>
Conflicts:
docs/reference/api/docker_remote_api_v1.25.md
Update `service ps` output format in swarm tutorial to match 1.12.0
(cherry picked from commit e1b77bd69a0789652252b5a1b338839541250dc1)
Signed-off-by: Tibor Vass <tibor@docker.com>
Remove reduntant word in device-mapper-driver.md
(cherry picked from commit 5c9bcaa9421699eb39df59cf12f9404bd4ebec82)
Signed-off-by: Tibor Vass <tibor@docker.com>
[Carry 24314] Make MongoDB sample Dockerfile working again
(cherry picked from commit 6e19e7b1d715ac5be4b1a7932b42c5a7eb99a9ad)
Signed-off-by: Tibor Vass <tibor@docker.com>
[carry 25174] 409 status code result to create service
(cherry picked from commit 2cb1281a4abe20f84cafa9d46f5660355e59ce44)
Signed-off-by: Tibor Vass <tibor@docker.com>
Conflicts:
docs/reference/api/docker_remote_api_v1.24.md
docs/reference/api/docker_remote_api_v1.25.md
Added shutdown to desired-state docs for filter node/service ps
(cherry picked from commit 1d8617a42b9e85f3098174234401d02595f84a79)
Signed-off-by: Tibor Vass <tibor@docker.com>
Conflicts:
docs/reference/api/docker_remote_api_v1.25.md
add status code 409 in attach in docs
(cherry picked from commit 56cbfc587f3e30d7587a4a4969d5497aa07edc06)
Signed-off-by: Tibor Vass <tibor@docker.com>
Conflicts:
docs/reference/api/docker_remote_api_v1.25.md
Give the correct link of docker swarm init
(cherry picked from commit 93fea86d1da9088899481519412070e2207cfd40)
Signed-off-by: Tibor Vass <tibor@docker.com>
Make it clear which parmeter is the user
(cherry picked from commit c7fcf496af8f7f5a6f3ab5397857ecfe91cbc192)
Signed-off-by: Tibor Vass <tibor@docker.com>
author merge: add services guide to manage a swarm
(cherry picked from commit 8b69d50c79f75f670fdc87e3e19c651551726605)
Signed-off-by: Tibor Vass <tibor@docker.com>
modifed d4mac and d4win download links to stable for v1.12
(cherry picked from commit 352c720d69f6c37c9b1e15332f46ea2dc4335cb9)
Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit 6440cacd49226e97b2dcb64eb31cb32b87b1ff18)
Signed-off-by: Tibor Vass <tibor@docker.com>
Rather than conflict with the unexposed task model, change the names of
the object-oriented task display to `docker <object> ps`. The command
works identically to `docker service tasks`. This change is superficial.
This provides a more sensical docker experience while not trampling on
the task model that may be introduced as a top-level command at a later
date.
The following is an example of the display using `docker service ps`
with a service named `condescending_cori`:
```
$ docker service ps condescending_cori
ID NAME SERVICE IMAGE LAST STATE DESIRED STATE NODE
e2cd9vqb62qjk38lw65uoffd2 condescending_cori.1 condescending_cori alpine Running 13 minutes ago Running 6c6d232a5d0e
```
The following shows the output for the node on which the command is
running:
```console
$ docker node ps self
ID NAME SERVICE IMAGE LAST STATE DESIRED STATE NODE
b1tpbi43k1ibevg2e94bmqo0s mad_kalam.1 mad_kalam apline Accepted 2 seconds ago Accepted 6c6d232a5d0e
e2cd9vqb62qjk38lw65uoffd2 condescending_cori.1 condescending_cori alpine Running 12 minutes ago Running 6c6d232a5d0e
4x609m5o0qyn0kgpzvf0ad8x5 furious_davinci.1 furious_davinci redis Running 32 minutes ago Running 6c6d232a5d0e
```
Signed-off-by: Stephen J Day <stephen.day@docker.com>
(cherry picked from commit 0aa4e1e68973ede0c73f8a4356e2a17fc903f549)
These links were temporarily changed, because the
docs were published before the 1.12.0 tag was
available.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit cd69b94241b94d16ac6dfad6e6bc7fc981dc2cca)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
this brings back the trailing whitespace in "runmetrics",
that were there intentially to force a line-break
also removes a duplicate redirect, that was present
on two pages
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d8434eba462752327d4c7769d3ce2c85013c211e)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
The archive is only available on docs.docker.com, and not
when doing a "make docs", so relative links will not resolve.
Making these links absolute, so that they always
point to the live "docs.docker.com" domain.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 4b090ae5f259dcedb946463a8512b2416a971fcb)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Swarm mode makes it possible through the API to set labels to containers
but not through command line. This tries to fix it.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 4031d70d1be2f02e1c9d6f7738f2a816be7eeef2)
Signed-off-by: Tibor Vass <tibor@docker.com>
Instead reserve exit code 2 to be future proof, document that it should
not be used. Implementation-wise, it is considered as unhealthy, but
users should not rely on this as it may change in the future.
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 91e9f3831330c63f8351b9fc3f7c31b3229505be)
Signed-off-by: Tibor Vass <tibor@docker.com>
