centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-27 14:28:47 +07:00
Code Issues Packages Projects Releases Wiki Activity
60,508 Commits 56 Branches 28 Tags
jekyll
Commit Graph

74 Commits

Author SHA1 Message Date
Guillaume Lours
b92ebe5fbf Replace docker-compose calls (#17881) 
* use 'docker compose' instead of 'docker-compose' in Swarm documentation

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>

* replace old usages of 'docker-compose' by 'docker compose'

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>

---------

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-08-08 10:05:39 +01:00
bagratte
f24fc7970e Proofread Swarm 
Co-authored-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
 2023-05-09 07:51:51 +04:00
Bjorn Neergaard
6b0c6de62e swarm: add context to VXLAN port docs 
Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
 2023-04-06 09:54:10 -06:00
David Karlsson
3fe2d7a0e5 Merge pull request #16234 from zombieleet/service-inspect-patch-1 
Use the correct error message when trying to inspect a nonexisting service
 2022-11-30 10:18:46 +01:00
Victory Osikwemhe
73ce2ff6c0 Use the correct error message when trying to inspect a nonexisting container 2022-11-28 12:49:52 +01:00
Craig Osterhout
53e81b04b8 remove DD mentions in swarm tutorial (#16158) 2022-11-15 10:04:02 +01:00
NitishKumar06
bdd8eb8dbe Removed the mentioning of docker machine 2022-09-29 22:55:05 +05:30
Justin Chadwell
fd9fe19061 lint: tidy up ordered list prefixes 2022-07-28 11:27:10 +01:00
Allie Sadler
cab9f914bf ENGDOCS-846 (#15219) 
* ENGDOCS-846

* fix broken links

* fix links

* fix broken links

* fix broken links

* fix broken links
 2022-07-27 13:26:22 +01:00
Sebastiaan van Stijn
461c6935c4 fix aligning in some output examples 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-04-12 11:44:41 +02:00
Usha Mandya
0417b58c87 Remove Docker machine from toc, update other references 
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
 2021-09-27 12:37:02 +01:00
Sebastiaan van Stijn
346a066b68 Desktop: move "docker-for-windows" to "desktop/windows" 
Unifying all content related to Docker Desktop to be withing the desktop
directory.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-08-14 13:28:15 +02:00
Sebastiaan van Stijn
d0bf342e52 Desktop: move "docker-for-mac" to "desktop/mac" 
Unifying all content related to Docker Desktop to be withing the desktop
directory.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-08-14 13:07:41 +02:00
Sebastiaan van Stijn
3b71231970 engine/swarm: use "console" for shell examples 
This allows for easier copying of the commands, without selecting the
prompt.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-08-06 17:19:56 +02:00
zori
398d77002d Fix typo in note for "create a new swarm" 2020-12-01 14:57:42 +01:00
Sebastiaan van Stijn
2ce808edc0 Remove references to obsolete engine versions 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-10-26 15:45:07 +01:00
Sebastiaan van Stijn
e3ef5c5085 machine: move overview page to /machine/ 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-10-21 15:44:05 +02:00
Dinakar Kulkarni
9c86eaaae2 Add space between prompt and command (#10876) 
When rendered in the actual docs, this will not be highlighted as a reference to a shell variable.
 2020-05-26 10:42:56 +01:00
Sebastiaan van Stijn
777c5d23da engine: use relative markdown links 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-04-23 13:03:32 +02:00
Sebastiaan van Stijn
d813acb6e1 Engine: reorganize install topic 
- Move getting started overview to /get-started/overview/
- Move engine installation files under /engine/
- Redirect the top-level /install/ to /get-docker/
- Updated titles in left-hand navigation
- Added back some pages to the navigation that were
  currently not included.
- Reduce some steps in the installation pages
- Move devicemapper prerequisites to the devicemapper
  storage driver page.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-04-06 10:50:28 +02:00
Sebastiaan van Stijn
331554f4b3 Fix various links that were generating URLs with .md (#10548) 
* Fix incorrect links in compose section

there's a bug causing wrapped links to not work, and replacing
some links to point to the .md file, so that IDE's can check
if the anchors are valid. Also replaced some links to point
to their new location.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* engine/swarm: update links

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

* Fix various broken links

There's a bug in the "jekyll-relative-links" plugin that causes wrapped links to not work.
Also replacing some links to point to the .md file, so that IDE's can check if the anchors
are valid. Finally, replaced some links to point to their new locations, so that users don't
get redirected..

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-04-01 12:05:50 +01:00
Maria Bermudez
dd128117e6 Addresses 7094 2019-02-28 13:48:12 -08:00
LStuker
69e4ed2f24 CURRENT STATE instead of LAST STAT 
With Docker version 18.09.1, build 4c52b90, the command `docker service ps helloworld` shows CURRENT STATE instead of LAST STATE.

Here is my example output of the command:
```
[root@docker01 ~]$docker service ps helloworld
ID                  NAME                IMAGE               NODE                DESIRED STATE       CURRENT STATE           ERROR               PORTS
3tj4b0gho76v        helloworld.1        alpine:latest       docker01            Running             Running 3 minutes ago

[root@docker01 ~]$ docker --version
Docker version 18.09.1, build 4c52b90
```
 2019-02-03 10:44:50 +01:00
paigehargrave
403da538a2 Update create-swarm.md 2019-01-11 13:12:20 -05:00
paigehargrave
4fb1c403ea Update index.md 2019-01-11 13:01:08 -05:00
paigehargrave
bb19d49405 Update index.md 2019-01-11 10:19:57 -05:00
thaim
1a2521cbc1 fix missing symbol to indicate start of command 2018-11-16 04:34:04 +09:00
Misty Stanley-Jones
a4f5e30249 Various copyedits to reduce future tense, wordiness, and use of 'please' (#5788) 
* Reword lots of instances of 'will'

* Reword lots of instances of won't

* Reword lots of instances of we'll

* Eradicate you'll

* Eradicate 'be able to' type of phrases

* Eradicate 'unable to' type of phrases

* Eradicate 'has / have to' type of phrases

* Eradicate 'note that' type of phrases

* Eradicate 'in order to' type of phrases

* Redirect to official Chef and Puppet docs

* Eradicate gratuitous 'please'

* Reduce use of e.g.

* Reduce use of i.e.

* Reduce use of N.B.

* Get rid of 'sexagesimal' and correct some errors
 2018-01-25 17:37:23 -08:00
ada
dd7a802a9d Clarify the DRAIN state w/ regard to containers (#5811) 
* Clarify the DRAIN state w/ regard to containers

Bare containers are not state-reconciled, and are not affected by the swarm DRAIN state
 2018-01-24 11:35:53 -08:00
kphunter
9308caf1f4 adds hostname to bash prompts (#5312) 2017-11-15 16:54:47 -08:00
Victoria Bialas
a4b4acc92c Fix links to subtopics in index.md files by include full path (#4054) 
* for all links to , changed to full path

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* fixed link in Swarm Tutorial per review comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-07-31 18:54:08 -07:00
Misty Stanley-Jones
023278aff2 Add link to Docker Machine setup for Linux hosts (#3711) 2017-06-26 15:44:04 -07:00
Misty Stanley-Jones
464599c2a6 Clarify what "networked host machines" means (#3657) 
Fixes #3646
 2017-06-19 11:52:02 -07:00
Michael Friis
6d067495f2 broken anchor (#3642) 2017-06-16 16:28:37 -07:00
John Mulhausen
dbf16812ac Fixes #2062 2017-04-25 17:22:26 -07:00
Guilherme Rezende
566af4709c Update delete-service.md (#2956) 
`docker service ps` needs the SERVICE-ID as a parameter, and the service don't exist after removed.
 2017-04-21 11:19:25 -05:00
Misty Stanley-Jones
a1291c8ef6 Add missing text (#2569) 2017-03-30 16:02:00 -07:00
Misty Stanley-Jones
fb7c73908b Update the styleguide (#2332) 
* Update the styleguide

Also normalize admonition titles with the colon outside the bold.
 2017-03-15 09:46:30 -07:00
Wang Jie
31d10935fb Update scale-service.md (#1961) 
Deleted "you can" because it shoud be "you must" in fact, so use imperative instead.
 2017-02-27 13:11:01 -08:00
Victoria Bialas
5f152ba7d9 Merge pull request #1952 from londoncalling/swarm-tutorial-onpage-links 
swarm mode tutorial improvements
 2017-02-23 18:10:01 -08:00
Victoria Bialas
7aaf72119d updated swarm and voting app tutorials per d4mac, d4win, toolbox and driver issues 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-02-23 17:48:22 -08:00
scjane
1ad3112d03 Update rolling-update.md (#1935) 
* Update rolling-update.md
 2017-02-23 16:56:13 -08:00
Victoria Bialas
d4add4ee20 swarm mode tutorial improvements 
modified what's next link to map to left nav TOC

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-02-23 15:21:31 -08:00
scjane
e970a64a97 Update create-swarm.md (#1934) 2017-02-23 01:18:15 -08:00
scjane
cb79fe5a1a Update create-swarm.md (#1933) 2017-02-23 01:17:02 -08:00
Victoria Bialas
1d21dea18e voting app graceful shutdown, d4win compatibility 
fixed tips and links

copy-edits and re-wording finishing touches

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-02-22 21:27:33 -08:00
Alessandro Boch
46a9be7289 Clarify port to open for overlay networking (#1762) 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-02-16 11:52:55 -08:00
Alessandro Boch
649210111a Fix docs about what protocol must be allowed for network encryption 
- This was inadvertently changed to `port`

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-02-06 10:04:31 -08:00
C.X. Ling
49a333885d Fix rendering of code block for swarm tutorial (#1370) 
Indentations are added to fix rendering failure.
 2017-01-25 11:01:00 -08:00
John Mulhausen
88a190986a Fixes rendering problems 2017-01-20 11:37:14 -08:00