Commit Graph

356 Commits

Author SHA1 Message Date
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
Julien Maitrehenry 59348a30a8 Fix #3029 (#3030) 2017-04-24 11:32:45 -07:00
Steven Hanna 08c99cc625 Link to docker secret CLI and docker secret compose information (#2993)
* Link to docker secret CLI and docker secret compose information

* changes to improve description
2017-04-24 09:55:21 -07:00
John Harris fd1fd15fa4 Add clarity note around required user-created overlay (#2972) 2017-04-21 14:06:05 -05:00
Julien Maitrehenry 3edabae435 Fix manager and worker join tokens
* Fix manager and worker join tokens. Issue #2088.

Fix screenshots per issue #2126

Move vote images to correct dir

Fix rendering issue with inline code snippet #1990

Fix for stack yaml reference (#1476)

Fix image link

Add shutdown procedures for #1017

* Make the fix asked in the PR

Little fix
2017-04-21 14:05:12 -05: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
Steven Hanna b43c302c46 Spelling mistakes (#2970)
* Spelling mistakes

* Delete last_page.md
2017-04-20 17:26:18 -05:00
Bill a3a7ae1e0b replaced docker/docker with moby/moby (#2879)
* replaced docker/docker with moby/moby

* fixed incorrect name changes in release notes

* fixed mentions of moby/moby in code
2017-04-20 15:32:18 -05:00
Wang Jie 80fb32322e Update join-nodes.md (#2850)
Fix 2082
2017-04-18 10:50:08 -05:00
Wang Jie 06eb57ded7 Typo on raft.md page (#2852)
Fix #2205
2017-04-18 10:49:21 -05:00
leonstrand afd9137079 nodes.md grammar correction (#2802) 2017-04-16 16:59:21 -07:00
Gluek 6823f365ad Update secrets.md (#2780)
remove correct secret
2017-04-14 13:00:03 -07:00
Misty Stanley-Jones 10be60a80f Go back to small /edge (#2736)
* Go back to small /edge

* Update site front page

Add info about Editions
Reorganize components
Update headings

* Move logic of fetching content to a script

* Add v1.28 API

* Add info about versioned API
2017-04-13 18:58:56 -07:00
John Mulhausen add2f680e8 Default highlight.js off, dockerfile > conf highlighting, pygments (#2757)
* Default highlight.js off, dockerfile > conf highlighting, pygments

* Address feedback, style changes, markdownify reductions

* Getting rid of more markdownify

* Fix for right-hand nav spacing
2017-04-13 17:10:29 -07:00
tiilikainen 7bed320b17 Update key-concepts.md (#2681)
Fixed broken internal href
2017-04-07 13:10:47 -07:00
Aaron Lehmann 3874bf2c60 Add docs for 17.04 Edge release 2017-04-05 17:45:44 -07:00
Aaron Lehmann a73be0d5a6 swarm: Add note about placement preferences
Docker 1.14 is adding a new feature called "placement preferences". This
adds a note about them, and a pointer to the "service create" reference
that explains them in detail.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-04-05 17:45:44 -07:00
Misty Stanley-Jones a1291c8ef6 Add missing text (#2569) 2017-03-30 16:02:00 -07:00
Jim Galasyn d8a53c0677 Fix typo (#2504)
Added "try" per #2204
2017-03-27 16:11:24 -07:00
Joao Fernandes 7b90ef4bdc Fix spelling errors (#2409) 2017-03-21 11:49:07 -07:00
adamoverton 1a9993c913 fixed typo from adressses to addresses (#2358) 2017-03-16 12:01:43 -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
Danny Ruiz 2452effd33 Fix wording in secrets.md (#2272) 2017-03-13 11:54:17 -07:00
Misty Stanley-Jones 0ef0fc321b Merge pull request #1985 from mkalish/patch-1
Replacing service with secret
2017-03-01 14:33:54 -08: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
Wang Jie b7bb7a29c2 Update swarm_manager_locking.md (#1960)
Modified the "Warning" style to comform to the style described in "Notes" in the documentation guide.
2017-02-27 13:10:15 -08:00
Wang Jie 0f762d3d5a Update swarm_manager_locking.md (#1959)
Deleted an extra "you".
2017-02-27 13:09:45 -08:00
Michael Kalish 5d83182b65 Replacing service with secret 2017-02-26 18:04:55 -05:00
scjane a1f580fb11 Update admin_guide.md (#1967) 2017-02-24 13:51:18 -08:00
scjane ad5ddc3f76 Update admin_guide.md (#1968)
* Update admin_guide.md

Fixed an invalid link.

* Update admin_guide.md
2017-02-24 13:50:20 -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
Misty Stanley-Jones eb43f86a67 Merge pull request #1941 from scjane/patch-50
Update nodes.md
2017-02-23 17:02:17 -08:00
scjane 52451c4bad Update manage-nodes.md (#1939)
* Update manage-nodes.md
2017-02-23 17:01:41 -08:00
Misty Stanley-Jones a0e23cc131 Merge pull request #1938 from scjane/patch-48
Update manage-nodes.md
2017-02-23 16:57:09 -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 71ccca95b9 Update join-nodes.md (#1937) 2017-02-23 14:24:52 -08:00
scjane 18a0f31566 Update nodes.md 2017-02-23 18:30:52 +08:00
scjane a82ee88aa8 Update manage-nodes.md 2017-02-23 17:50:35 +08:00
scjane a90f70e360 Update join-nodes.md (#1936) 2017-02-23 01:27:46 -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
mw75 dddd864438 Update services.md (#1504)
* Update services.md
2017-02-22 11:15:15 -08:00
scjane 01278d0c4e Update index.md
Seems that "and" is missing?
2017-02-17 11:59:13 -08:00
Pascal Andy f8cd1174db Fix docker ps ... --name (#1795)
Should be docker ps ... name
2017-02-16 23:43:13 -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
Misty Stanley-Jones e7300cf848 Merge pull request #1566 from mstanleyjones/1072_swarm_backup
Add info about backing up swarms
2017-02-14 11:37:59 -08:00
Misty Stanley-Jones 551b30f319 Add info about backing up swarms
A little reorganization and clean-up along the way
2017-02-13 17:19:45 -08:00
Pascal Andy adf14bbba3 Fix and issue with CMD docker exec
docker exec $(docker ps --filter name=redis -q)

not docker exec $(docker ps --filter --name=redis -q)

Cheers!
2017-02-10 11:13:12 -05:00
Justyn Shull c59f972f46 Update secrets.md - fix typo (#1574)
rottate -> rotate
2017-02-09 12:19:37 -08:00
Jeffery Bradberry a9da7672a5 Update services.md 2017-02-07 14:14:05 -05: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
Misty Stanley-Jones 9e29d0e03d Fix more broken links and images 2017-01-26 11:36:27 -08:00
Misty Stanley-Jones ef95a915eb Fixing broken links
Formatting improvements along the way
2017-01-25 11:51:14 -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
Adrien Duermael 6129c4c255 remove apidocs/layouts after build (#1357)
* remove apidocs/layouts after build

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* fixed keywords in swarm_manager_locking.md

Signed-off-by: Adrien Duermael <adrien@duermael.com>
2017-01-24 14:26:04 -08:00
Misty Stanley-Jones dc42fddb45 Document swarm locking 2017-01-23 14:33:40 -08:00
MAA b13718002c Smallish typo (#1220) 2017-01-20 11:51:40 -08:00
John Mulhausen 88a190986a Fixes rendering problems 2017-01-20 11:37:14 -08:00
LRubin e22150bd43 fix markdown (#1293)
Signed-off-by: LRubin <lrubin@docker.com>
2017-01-20 11:32:19 -08:00
John Mulhausen 1a8ff37edb Update stack-deploy.md 2017-01-19 23:48:54 -08:00
Sebastiaan van Stijn a7cb8d980c remove confusing sentence from "publishing" section
the routing mesh should work irregardless of all
replicas being up or not, so removing this sentence.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-19 11:21:04 -08:00
Misty Stanley-Jones 6415ff6660 Add info about image resolution with content trust 2017-01-19 11:21:03 -08:00
Misty Stanley-Jones b0b446398c Document the ability to publish a port locally on a swarm node 2017-01-19 11:20:58 -08:00
Misty Stanley-Jones 3d72d43908 Update the syntax of 'docker secret create' in the examples 2017-01-19 11:18:23 -08:00
Misty Stanley-Jones 9d50621cdb Update syntax of the -f flag in the examples 2017-01-19 11:18:22 -08:00
Misty Stanley-Jones f4a28b31ec Document Docker secrets
Fixes #529

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-01-19 11:18:18 -08:00
Misty Stanley-Jones 46e044ec59 Fixing double curly braces 2017-01-19 11:09:49 -08:00
Aanand Prasad 31a3924eb8 First version of stack deployment tutorial
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2017-01-19 10:38:48 -08:00
Misty Stanley-Jones 1b80389ff4 Document ability to update a service's image
Fixes #528

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-01-19 10:38:45 -08:00
Aaron Lehmann 2169ef3b2e swarm: Document rollback, failure threshold, and monitor flags
These are new flags to service create/update being added in a Docker
engine PR.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-01-19 10:12:37 -08:00
Misty Stanley-Jones e3a3145cd9 Sync vnext-engine branch to docker/docker SHA 2f12d2808464dcfdf45e0920fd508ce0ff12bd29
This branch will contain forward-looking Engine-specific docs
and be the equivalent of docker/docker master for docs
2017-01-19 10:10:15 -08:00
Viet Hung Nguyen 956f77d618 Clarify the command only for docker-machine (#1149)
* Clarify the command only for docker-machine
2017-01-18 15:17:18 -08:00
lj8930 cb3d925f7f fix typo in swarm tutorial 2017-01-17 11:24:55 +08:00
Juan Eugenio Abadie 9880cc46f2 Fix title (#1056)
The title is not rendered correctly because of the missing newline
2017-01-09 14:04:05 -08:00
Lars-Magnus Skog bc3704815d accross -> across 2017-01-06 18:56:14 +01:00
Victoria Bialas 665ac6d3df update swarm worker node concept description
incorporated review comments from Misty

re-worded topic titles and added to description of node

fixed links for services and tasks

incorporated more comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-04 14:39:08 -08:00
David c06c4eb55b Update services.md
Correct typographical error.
2017-01-03 12:22:18 +00:00
Peter Dave Hello 5919563eb8 Lossless Image optimization (#959)
* re-compress jpg images losslessly using jpegoptim

* re-compress png images losslessly using zopflipng
2016-12-21 11:12:13 -08:00
luojie233 e735294bb5 duplicated the (#957)
Signed-off-by: Jie Luo <luo612@zju.edu.cn>
2016-12-21 11:05:56 -08:00
LRubin 8cdcd420b0 Update create-swarm.md (#954)
Removes some spaces that were apparently b0rking the code block there.
2016-12-20 17:20:30 -08:00
Nathan Guse 49dafa36f2 Fix Recovering from losing the quorum link (#860) 2016-12-13 12:51:52 -08:00
Chris Dituri 1c4fe38c04 fix typo in engine/swarm/how-swarm-mode-works/services.md (#857)
Signed-off-by: Chris Dituri <csdituri@gmail.com>
2016-12-13 12:50:02 -08:00
Michal Guerquin 204051f35c Fix typo (#853)
UCP -> UDP
2016-12-12 16:10:30 -08:00
Misty Stanley-Jones 67b2ea0565 Merge pull request #297 from mstanleyjones/swarm_service_create_no_suitable_node
Add to swarm admin docs
2016-12-12 11:12:45 -08:00
Misty Stanley-Jones 8e7f320f2c Clarify when the task containers are deleted
Fixes #683
2016-12-08 09:48:46 -08:00
Victoria Bialas 7ce29c9a76 Merge pull request #817 from londoncalling/banner-for-old-swarm-docs
added advisory banner to legacy swarm docs w/links to swarm mode
2016-12-06 23:08:17 -08:00
Victoria Bialas 59c5544d8b added advisory banner to legacy swarm docs w/links to swarm mode
copyedit

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-12-06 17:03:45 -08:00
Adrien Duermael 50ee158a65 CI - added test for keywords in markdown frontmatters (#805)
* added test for keywords

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* fixed keywords in some md files for tests to pass

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* fixed keywords in /datacenter

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* tests/Dockerfile: no need to add git

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* tests/Dockerfile: changed maintainer

Signed-off-by: Adrien Duermael <adrien@duermael.com>
2016-12-06 16:45:11 -08:00
Victoria Bialas 67544654bc added Nathan's explanation of engine vs. node labels
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-12-02 15:33:23 -08:00
Matt Bentley d915deff95 Move rebalcing to be a top level item (#753)
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
2016-11-30 14:53:42 -08:00
Misty Stanley-Jones c4c047f5f2 Add to swarm admin docs
- Add details about maintaining quorum
- Add details about pending tasks

Relates to #26017
Relates to #25069

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-28 15:59:18 -08:00
Misty Stanley-Jones 1b8631d28c Document publishing a UDP port
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-28 15:41:00 -08:00
Misty Stanley-Jones 756f4d974c Fix some doubled words
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-28 11:32:17 -08:00
LRubin 26ce688e26 Adds a space to correct broken code block
Kramdown is picky. :)
2016-11-18 15:31:25 -08:00
fresnizky b0e05667f9 Added command for ssh into swarm manager 2016-11-12 19:27:34 -03:00
Gaetan a5e01e1844 fix type of keywords entry in frontmatter (in /engine/) (#552)
keywords should be a string, not an array containing one string

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-11 14:45:24 -08:00
Misty Stanley-Jones eb5c8670bc Change instances of alias: to redirect_from:
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-04 17:07:02 -07:00
John Mulhausen 558314bf56 Converges titles to imperative-form, front-matter based, and sentence-case (#438)
Multiple title fixes, consistency fixes, convergence into metadata-based titles.
2016-11-04 15:38:40 -07:00
Misty Stanley-Jones 1a193d749b Revert "Merge pull request #437 from gdevillele/fix_keywords_format"
This reverts commit 13ddc1350e, reversing
changes made to 7a11f05943.
2016-11-04 13:33:29 -07:00
Misty Stanley-Jones 33d3d067d0 Revert "fix some frontmatter keywords values" 2016-11-04 13:30:04 -07:00
Misty Stanley-Jones 13ddc1350e Merge pull request #437 from gdevillele/fix_keywords_format
fix some frontmatter keywords values
2016-11-04 10:50:53 -07:00
Gaetan 8bb4d6226a fix more frontmatter keywords values (#439)
* fix format of frontmatter keyword entry in some .md files

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-04 10:48:38 -07:00
Gaetan de Villele 7a11f05943 fix some frontmatter keywords values
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-03 10:22:12 -07:00
Adrien Duermael 8fa5f3a5de absolute links to docs.docker.com are now relative links
Signed-off-by: Adrien Duermael <adrien@duermael.com>
2016-11-01 17:01:41 -07:00
Adrien Duermael e7ab7f7d03 removed menu.md files
Signed-off-by: Adrien Duermael <adrien@duermael.com>
2016-10-31 13:45:56 -07:00
Victoria Bialas f48157d696 Update swarm-mode.md 2016-10-25 12:11:35 -07:00
Misty Stanley-Jones 717d64348b Additional information about scaling a service
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-10-20 11:03:36 -07:00
Misty Stanley-Jones d92715537f Merge pull request #230 from afrazkhan/master
Info about IP 50 needing to be open
2016-10-19 14:52:10 -07:00
John Mulhausen f8776699de Merge pull request #223 from danix800/fix-typos
Fix typos.
2016-10-18 16:31:21 -07:00
Misty Stanley-Jones 01910ab6d9 Update branding for macOS
Apple has changed their branding guidelines from 'OS X' to 'macOS'
so we should update ours to be within trademark / branding
guidelines. See http://www.apple.com/macos/sierra/

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-10-18 09:21:09 -07:00
Ding Fei bab82e94f6 Fix typos and updated a few links, some sentences.
Signed-off-by: Ding Fei <dingfei@stars.org.cn>
2016-10-18 17:04:10 +08:00
Afraz Ahmadzadeh dcfbf407b0 Typo in docs 2016-10-18 07:58:08 +02:00
Afraz Ahmadzadeh 0dcdc43cb1 Info about IP 50 needing to be open 2016-10-17 10:29:28 +02:00
Misty Stanley-Jones 232043cfa6 Merge pull request #148 from mstanleyjones/swarm_add_node_clarify
Clarify what happens when a failed swarm node recovers
2016-10-11 16:14:52 -07:00
Misty Stanley-Jones 62f4a04e39 Clarify what happens when a failed swarm node recovers
Fixes #105
2016-10-11 16:13:04 -07:00
John Mulhausen 2b6cbd8255 Merge pull request #150 from BSCheshir/patch-2
node1
2016-10-11 01:39:48 -07:00
John Mulhausen 1dc817611b Formatting fixes 2016-10-11 01:24:55 -07:00
BSCheshir a1edd7ce09 node1
little bit before
ID                         NAME      IMAGE  NODE   DESIRED STATE  CURRENT STATE               ERROR
63s86gf6a0ms34mvboniev7bs  my-web.1  nginx  node1  Running        Running 58 seconds ago
2016-10-11 01:40:51 +04:00
Misty Stanley-Jones 220bbed0e4 Fix incorrect information about swarm port assignment 2016-10-10 10:02:15 -07:00
Benjamin R. Haskell 362e94b2bc Disable Liquid templating for blocks with `{{`
Instead of disabling templating for entire files, fix instances
individually by wrapping blocks in:

    ```{% raw %}
    ... content ...
    {% endraw %}```

Signed-off-by: Benjamin R. Haskell <docker@benizi.com>
2016-10-07 00:58:08 -04:00
Benjamin R. Haskell 65ec3a3763 Revert pull request #48
Reverts commit b3a620808a in order to
replace it with more-targeted blocks.
2016-10-07 00:56:17 -04:00
Benjamin R. Haskell b3a620808a Fix formatting for Markdown files containing `{{`
They're usually examples of Go-style text templates.  But, Liquid templating is treating them as variable substitutions.  E.g., in `engine/reference/commandline/ps.md`:

```bash
$ docker ps --filter volume=remote-volume --format "table {{.ID}}\t{{.Mounts}}"
```

is rendered as:

```bash
$ docker ps --filter volume=remote-volume --format "table \t"
```

Solution is to wrap entire files in `{% raw %} ... {% endraw %}` blocks.
2016-10-05 01:58:24 -04:00
John Mulhausen c03bb7f90c Update services.md 2016-10-04 16:59:05 -07:00