Commit Graph

281 Commits

Author SHA1 Message Date
Trapier Marshall 64279e87a6 fix swarm service constraint examples
1. Be more specific about what happens when constraints aren't satified.
    2. There is no `--global`.  Also addressed in network/overlay.md.
    3. Label constraints do not match node labels without `node.label` prefix.

AFAIK neither 2 nor 3 have ever been correct

testedon: 17.06.2-ee-16
2018-09-06 12:49:45 -04:00
Maria Bermudez 30390528f6
Delete swarm-mode.md
Remove file from kubernetes branch.
2018-09-04 11:26:03 -07:00
Maria Bermudez 4320c439c1
Update swarm-mode.md
Incorporate changes made in kube-net-encryption branch.
2018-09-04 08:30:55 -07:00
Anne Henmi 664dc1726e
Update swarm-mode.md 2018-09-04 08:54:52 -06:00
Anne Henmi 6b5469b855 Created content for Issue 670. Ready for review. 2018-08-30 13:47:38 -06:00
Maria Bermudez aaca9b83b5 Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2""
This reverts commit 4c95d161ca.
2018-08-29 19:01:03 -07:00
Maria Bermudez 4c95d161ca Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"
This reverts commit af5f2fcc38, reversing
changes made to 338b690d26.
2018-08-29 18:37:44 -07:00
Maria Bermudez 840c167055 Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2""
This reverts commit 14080c18bd.
2018-08-29 18:36:03 -07:00
Maria Bermudez 14080c18bd Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"
This reverts commit af5f2fcc38, reversing
changes made to 338b690d26.
2018-08-29 14:47:31 -07:00
Michael Herman f26babcc29 Update secrets.md 2018-06-28 15:25:42 -07:00
John Yani a362eba1c7 Service templates: Capitalize .Node.Hostname (#6753) 2018-05-24 08:52:28 -07:00
Nathan Jones 6df075f1c7 Add node.hostname to Go template placeholder options
The following command works on Docker CE 18.03.1-ce so .node.hostname should be included in the doc:

`docker service create --name myservice --hostname="{{.Node.Hostname}}-{{.Service.Name}}" busybox top`

This does not yet work however on the latest EE release, so I'd like some help knowing how best to add a note indicating this on the page.
2018-05-16 16:09:07 -07:00
Bo Chen 3dee59ac95 correct a mistake 2018-05-16 16:00:20 -07:00
Robert Hafner 5804b3ae18 Clarify which manager to run the join command on 2018-05-15 15:58:33 -07:00
Constantin Galbenu c5c80569a0 Updated a broken link (#6650) 2018-05-10 09:01:30 -07:00
Trapier Marshall 927844cac4 move mount csv note from services to volumes (#6568) 2018-04-27 09:50:19 -07:00
Trapier Marshall f3a65169a1 tone down service bind mount admonishment (#6567) 2018-04-27 09:45:07 -07:00
Trapier Marshall 45350ed397 clarify independence of volume lifecycle (#6563) 2018-04-27 09:44:21 -07:00
Darius Kramer 627793e1a8 Fix minor typo in services.md (#6485) 2018-04-20 09:53:59 -07:00
Gwendolynne Barr 3243cec451
Fix wrapping swarm states (#6438) 2018-04-12 08:12:56 -07:00
Gwendolynne Barr 542032cf21
Add swarm task state REMOVE (#6206) 2018-04-11 13:46:29 -07:00
Dilip 373214ff98 Use printf instead of echo
`echo` adds a newline feed for the given input, therefore, it doesn't work.
2018-04-02 15:20:01 -07:00
Trapier Marshall 67076f0ef8 swarm services: correct typo
Signed-off-by: Trapier Marshall <trapier.marshall@docker.com>
2018-04-02 15:08:24 -07:00
Eric Smalling 50beb52f48 Adding 500KB content limit note (#6330)
Size limit per https://github.com/docker/swarmkit/blob/master/manager/controlapi/config.go#L18
2018-03-29 07:07:53 -07:00
Akim Demaille 14b53b68c3 Jekyll: don't put {% raw %} directives in pre blocks
Replace all occurrences of

    ```foo
    {% raw %}
    bar
    {% endraw %}
    ```

(which generates spurious empty lines in the rendered pre block) with

    {% raw %}
    ```foo
    bar
    ```
    {% endraw %}

Also, fix some occurrences where the raw section is too large and
prevented interpretation of Jekyll directives.

This is the syntax used in the documentation of Jekyll itself:

https://raw.githubusercontent.com/jekyll/jekyll/master/docs/_docs/templates.md

FTR, done with two perl substitutions:

    '^([\t ]*```[^\n]*
    )([ \t]*\{% raw %\}[^\n]*
    )' '$2$1'

and

    '^([ \t]*\{% endraw %\}[^\n]*
    )([\t ]*```[^\n]*
    )' '$2$1'

and manually tweaks.  A mechanical check would be most useful.

Signed-off-by: Akim Demaille <akim.demaille@docker.com>
2018-03-13 10:28:29 -07:00
Misty Stanley-Jones a17a47dd77
Favor docker <object> <verb> format of commands (#5914)
Remove instances of:
- docker rmi
- docker images
- docker stop
- docker rm
- docker create
- docker exec
- docker attach
2018-02-05 09:33:47 -08:00
Misty Stanley-Jones 72c6cbce38
Document an example for --with-registry-auth flag (#5882) 2018-01-31 13:55:42 -08:00
Misty Stanley-Jones e9be468ed2
Add info about setting config options (#5879) 2018-01-31 11:23:40 -08:00
Misty Stanley-Jones a55ddf60a9
Move /engine/installation to /install (#5651)
* Move /engine/installation to /install

* Add Docker for IBM Cloud to the matrix
2018-01-26 10:29:14 -08: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
Logan Rakai 4c4543e467 Typo fix (#5707) 2018-01-11 09:11:27 -08:00
Logan Rakai 2dd0056d60 Correct warning text (#5700)
may still be locked -> may still be unlocked
2018-01-09 08:05:46 -08:00
Michael Friis 424e7c4c63 clean up whitespace (#5665) 2018-01-05 10:59:44 -08:00
Misty Stanley-Jones 15eb7fe379 Swarm service isolation (#5564) 2018-01-02 17:13:00 -08:00
Renato Piccoli d30e1955a9 Confusion between `--publish` and `published` (#5614) 2017-12-27 11:25:20 -08:00
Peter Kokot 1dba72ce24 Fix typo (#5611)
This patch fixes minor typo of the `docker-compose` command.
2017-12-26 12:40:03 -08:00
Miguel A. C b49dbf9dbd Fix typo in how pki works in swarm (#5566) 2017-12-19 13:08:28 -08:00
Jim Galasyn 3ef9318fa1 Remove PS> prompts from Windows snippets (#5538) 2017-12-15 15:49:27 -08:00
Lachlan Cooper 1fa2c0387a Correct parameter names for --publish long syntax (#5457) 2017-12-12 12:59:30 -08:00
Misty Stanley-Jones 50e775a4a6
Fix example labels (#5419) 2017-11-30 09:51:49 -08:00
Misty Stanley-Jones 69350e7b92
Fix typo in flag name (#5376) 2017-11-22 11:48:24 -08:00
Gwendolynne Barr 9e348b0943 Repair broken link (#5341) 2017-11-21 09:21:55 -08:00
Misty Stanley-Jones 956fe5924d
Update docs for new publish syntax (#5323) 2017-11-17 12:08:29 -08:00
kphunter 9308caf1f4 adds hostname to bash prompts (#5312) 2017-11-15 16:54:47 -08:00
Bret Fisher 06e64aaefe add placement pref note about null labels (#5250) 2017-11-10 14:05:34 -08:00
Misty Stanley-Jones 8d446fd3eb
Clarify note about services running in host mode (#5265) 2017-11-09 11:54:11 -08:00
Misty Stanley-Jones e9fa593562 Add info about network size limits for swarm mode 2017-11-02 15:42:41 -07:00
Victoria Bialas 81270cbd7d
added clarification to swarm configs and stack deploy topic (#5159)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-10-30 14:20:40 -07:00
Michael a9812d3712 Minor edit (#5114)
Using verbose args in example makes it easier to grok
2017-10-25 18:09:59 -07:00
Misty Stanley-Jones 6e2ebea106 Address feedback about placement constraints and prefs (#5101) 2017-10-24 16:25:25 -07:00
Koen Punt eccd6be00a remove duplicate word (#5091) 2017-10-24 10:29:08 -07:00
Misty Stanley-Jones 3c614d655f Explain placement constraints and preferences (#4635) 2017-10-23 16:18:08 -07:00
Misty Stanley-Jones 142aee0354 Flesh out swarm key concepts (#4634) 2017-10-20 11:09:23 -07:00
Jim Galasyn bfe261f90d Fix redirect in swarmn task states topic (#4994) 2017-10-16 12:14:40 -07:00
Jim Galasyn 3c3319860e Move task states topic to Engine (#4961) 2017-10-13 16:00:10 -07:00
Misty Stanley-Jones 990a5be262 Cross-linking between compose and configs/secrets (#4869) 2017-10-10 11:08:51 -07:00
Misty Stanley-Jones 31408e4c8b Fix broken link (#4868) 2017-10-10 11:07:53 -07:00
Gwendolynne Barr 9923c1d83d Clarify VIP vs DNSRR options (#4736) 2017-09-29 14:52:21 -07:00
Matt Gucci 8066416e76 Fix Docker for XX (#4710)
Docker for Mac 17.06
-> Docker for Windows 17.06 CE
2017-09-25 09:17:30 -07:00
Mathieu Parent 5f554f4d97 Add missing option to customized docker_gwbridge (#4698) 2017-09-22 10:18:14 -07:00
Misty Stanley-Jones 93b6932f13 Update example to use official consul image (#4670) 2017-09-19 15:37:23 -07:00
zaggash a9bbafe693 Missing space (#4535) 2017-09-11 17:03:53 -07:00
Wang Jie 56d1919195 Update manage-nodes.md (#4487) 2017-09-11 16:31:02 -07:00
Wang Jie 6833309f82 Update swarm-mode.md (#4459) 2017-09-11 09:52:53 -07:00
Wang Jie dc4c54c248 Update services.md (#4457) 2017-09-11 09:51:36 -07:00
Wang Jie 0e34cf9d39 Update nodes.md (#4442) 2017-09-11 09:50:58 -07:00
Wang Jie daa8ce8948 Update services.md (#4484)
Change "a HTTP xxx" to "an HTTP xxx".
2017-09-05 14:27:32 -07:00
Wang Jie 70dcc0d6c5 Update networking.md (#4501) 2017-09-05 14:26:34 -07:00
Wang Jie 02bbc4118c Update secrets.md (#4507) 2017-09-05 14:25:11 -07:00
Misty Stanley-Jones 314bb55b54 Clarify info about custom path for secrets (#4073) 2017-08-29 15:10:56 -07:00
Misty Stanley-Jones 0c3666ddae Document ability to install plugins on swarm nodes (#4064) 2017-08-29 15:10:56 -07:00
Steve Sharp 23f59b8d9a Update services.md (#4259)
Fixes typo:
Currently "To prevent this from happening. ensure..."
Proposed "To prevent this from happening, ensure..."
2017-08-18 10:46:42 -07:00
moncho f6150717ae Minor correction (#4078) 2017-08-03 15:50:20 -07: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
Alican Akkuş 989fbc2410 updated key concept (#3959)
docker service, will run on the manager or worker. Last file contains only worker.
2017-07-26 10:44:28 -07:00
Victoria Bialas 922ae1201b updated Docker version information for Cloud (#3896)
* updated Docker version information for Cloud

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

* modified Docker Engine references to Docker x.x

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

* improved version information

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

* fixed typo per review

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-07-18 14:04:52 -07:00
Chandan Pasunoori 70ed3231a1 Update configs.md (#3781)
bash format
2017-07-05 16:48:49 -07:00
Misty Stanley-Jones 7f966c4c10 Remove edge-only admonitions 2017-06-28 08:31:29 -07:00
Misty Stanley-Jones 3b5192d199 Add release notes from upstream repos into the formal docs (#3644)
* Import release notes from upstream projects

* Fix Liquid errors

* Try a new structure

* Update 17.06 release notes to RC5
2017-06-28 08:31:29 -07:00
Misty Stanley-Jones 08f830811d Add configs to compose file reference 2017-06-28 08:31:29 -07:00
Misty Stanley-Jones 6c1286d80d Improve the Windows secret and config examples 2017-06-28 08:31:29 -07:00
Misty Stanley-Jones 044bc28dbb Add docs about configs 2017-06-28 08:31:29 -07:00
Misty Stanley-Jones abae9c48fa Document Windows secret support 2017-06-28 08:31:29 -07:00
Misty Stanley-Jones 26bfc6ef69 Document custom target directory for secrets 2017-06-28 08:31:29 -07:00
Misty Stanley-Jones 7b006d7c65 Add info about new --datapath-addr flag (#3479) 2017-06-28 08:31:29 -07:00
Ying Li 5d344c4250 Add information about how CA rotation works to the swarm mode PKI doc (#3439) 2017-06-28 08:31:29 -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 9d53ce7350 Clarify routing mesh port 2017-06-20 11:07:50 -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
Misty Stanley-Jones dda29b7fc4 Update curl examples to use 'localhost' (#3617) 2017-06-15 10:36:19 -07:00
leonstrand 44c31878d8 Update services.md (#3521)
Change 'correcty' to 'correct way'
2017-06-09 10:55:46 -07:00
Misty Stanley-Jones a173c4630d Document OOME information (#3536) 2017-06-09 09:41:00 -07:00
Misty Stanley-Jones e11009b304 Reorg service management topic (#3462)
Move some things that were previously in the CLI ref
Some rewrites and reorganization
Add placement pref image
2017-06-02 14:46:24 -07:00
Misty Stanley-Jones cf3f1f6e37 Rewrite swarm service networking guide (#3454) 2017-06-01 13:42:33 -07:00
Misty Stanley-Jones f732322462 Add docs for automatic service rollback (#3248) 2017-05-11 15:34:16 -07:00
John Mulhausen dbf16812ac Fixes #2062 2017-04-25 17:22:26 -07:00
Thomas Noe 99c7f1e503 remove cadvisor from swarm example -- #1840 (#2939)
Signed-off-by: Thomas Noe <thomas.noe@madwiremedia.com>
2017-04-25 16:00:55 -07:00
Lenny Linux 9a1f99cd11 add warning class and a linebreake to the warning blogquote (#2937)
* Update fedora.md

add warning class to blogquote

* Update linux-postinstall.md

add warning class to blogquote

* Update ubuntu.md

add warning class to blogquote

* Update https.md

add warning class to blogquote

* Update swarm_manager_locking.md

add warning class to blogquote

* Update dockerlinks.md

add warning class to blogquote

* Update deploying.md

add warning class to blogquote

* Update deploying.md

add warning class to blogquote

* Update insecure.md

add warning class to blogquote

* Update discovery.md

add warning class to blogquote

* Update dockerd.yaml

add warning class to blogquote

* Update docker_secret_rm.yaml

add warning class to blogquote

* Update docker_service_rm.yaml

add warning class to blogquote

* Update docker_secret_rm.yaml

add warning class to blogquote

* Update scale-your-cluster.md

add warning class to blogquote

* Update resource_constraints.md

add warning class to blogquote

* Update binaries.md

add warning class to blogquote

* Update content_trust.md

add warning class to blogquote

* Update secrets.md

add warning class to blogquote

* Update index.md

add warning class to blogquote

* Update install-sandbox-2.md

add warning class to blogquote

* Update docker-toolbox.md

add warning class to blogquote

* Update index.md

add warning class to blogquote

* Update centos.md

add warning class to blogquote

* Update debian.md

add warning class to blogquote

* Update faqs.md

add linebreak after Looking for popular FAQs on Docker for Windows?

* Update install.md

add linebreake after **Already have Docker for Windows?**

* Revert "Update dockerd.yaml"

This reverts commit 3a98eb86f700ade8941483546c33f69a9dab8ac3.

* Revert "Update docker_secret_rm.yaml"

This reverts commit 5dc1e75f37033932486c11287052b7d64bf83e55.

* Revert "Update docker_service_rm.yaml"

This reverts commit a983380a5625b471f1a03f8ed2301ead72f98f1b.

* Revert "Update docker_secret_rm.yaml"

This reverts commit 4c454b883c300e26fbb056b954bb49ec2933b172.
2017-04-25 11:33:27 -07:00