Commit Graph

257 Commits

Author SHA1 Message Date
Maria Bermudez be13b49abc
Merge pull request #7698 from thaim/patch-1
fix missing symbol to indicate start of command
2018-12-13 10:42:34 -08:00
WeJie 4d67e28b63
Fix wrong command
Should use ` docker service ps nginx` verify the nginx service is fully re-deployed, not `docker service ls nginx`.
2018-12-07 23:22:46 +08:00
WeJie d63986a46f
Get some miss content back from commit history 2018-12-02 16:19:42 +08:00
thaim 1a2521cbc1 fix missing symbol to indicate start of command 2018-11-16 04:34:04 +09:00
Justin I. Nevill d393a90309
Merge pull request #844 from docker/beta-cleanup
Removed Beta disclaimer tags
2018-11-04 13:32:21 -05:00
Maria Bermudez d7a21d29db Merge public:master into private 2018-11-02 10:03:18 -07:00
Anne Henmi 9417008906 Last of the files. 2018-11-02 09:28:22 -06:00
Anne Henmi 69aa7d395d
Update join-nodes.md
Incorporated @JustinINevill's feedback.
2018-10-16 08:55:58 -06:00
Anne Henmi fc9fdb01ac
Update join-nodes.md
Added in @andrewhsu's feedback.
2018-10-15 15:07:45 -06:00
Anne Henmi 7de1b2033e
Update join-nodes.md
Added beta tag.
2018-10-10 10:49:01 -06:00
Anne Henmi 03e3c4dd51
Update join-nodes.md 2018-10-10 10:43:49 -06:00
Anne Henmi 432984c74d
Update join-nodes.md 2018-10-10 10:43:02 -06:00
Anne Henmi 27446f1fba
Update join-nodes.md
Fixed @justincormack's clarification on running a mixed-FIPS environment.
2018-10-04 19:29:09 -06:00
Maria Bermudez eb608ee28d
Merge branch 'master' into spelling 2018-10-04 12:18:34 -07:00
Anne Henmi 7d80bd0202 Included updates from https://github.com/docker/docker-core-backlog/issues/375. 2018-10-03 14:03:10 -06:00
Maria Bermudez 6c3bae4317
Update services.md
Fixes [7435](https://github.com/docker/docker.github.io/issues/7435)
2018-09-27 16:54:23 -07:00
Oscar Caballero 269c80d2d9 Spelling revision 2018-09-23 21:43:11 +02:00
Anne Henmi f4576b44fa
Update swarm-mode.md
fixed typo
2018-09-19 07:56:03 -06:00
Anne Henmi 5ab93890e5
Update swarm-mode.md
Incorporated @selansen's feedback
2018-09-18 21:10:54 -06:00
Anne Henmi 329498653f
Update networking.md
Incorporated @bermudezmt's feedback
2018-09-18 21:09:47 -06:00
Anne Henmi 8f465b4a01
Merge branch 'master' into swarm-default-network-670 2018-09-14 14:24:05 -06:00
Anne Henmi 783cc9fb4a
Update networking.md
Incorporated Maria's feedback.
2018-09-12 18:12:57 -06:00
Anne Henmi 3695cd0b74
Update swarm-mode.md
Cleaned up Mark's additions
2018-09-12 13:30:41 -06:00
Anne Henmi 3bae1bb428
Update networking.md
Cleaned up Mark's additions.
2018-09-12 13:26:00 -06:00
Maria Bermudez 0cbcdb3777 Re-add swarm mode page 2018-09-10 14:56:59 -07:00
Mark Church ea9e729e21 added default address pools installation/usage comments across UCP install, swarm install, and networking pages 2018-09-08 14:02:42 -07:00
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