Commit Graph

1465 Commits

Author SHA1 Message Date
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
Maria Bermudez 30390528f6
Delete swarm-mode.md
Remove file from kubernetes branch.
2018-09-04 11:26:03 -07:00
Maria Bermudez 016bcb74c9
Delete cc-ee-node-activation.md
Remove file from kubernetes branch
2018-09-04 11:25:40 -07:00
Maria Bermudez 48ab28e3d3
Delete cc-ee-node-activation.md
File incorrectly added to the wrong branch.
2018-09-04 08:31:28 -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 599f5bba6d
Update cc-ee-node-activation.md 2018-09-04 08:51:38 -06:00
David Deyo fc6ce901f9
Update cc-ee-node-activation.md 2018-08-31 10:43:04 -07:00
Anne Henmi 6b5469b855 Created content for Issue 670. Ready for review. 2018-08-30 13:47:38 -06:00
Anne Henmi 536c65d4fb Created Issue 673. Ready for review. 2018-08-30 13:27:39 -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
Tammy Fox 1c1b1c092b
Merge pull request #6997 from scjane/patch-102
Update userns-remap.md
2018-08-06 15:56:37 -04:00
kmddevdani 6c3b584839
added data directory for mac to antivirus doc
might solve #7136
2018-07-31 09:07:45 +12:00
Shayne Boyer 240a1836ac
Update dotnetcore.md
removed version to ensure always up to date; getting latest
2018-07-17 08:26:44 -07:00
Shayne Boyer b3d4391849
Update dotnetcore instructions
* Base image for aspnetcore were migrated as of 2.1 per https://github.com/aspnet/Announcements/issues/298 
* Further reading reference to Docker Hub updated to /dotnet 
* Add link to docs.microsoft.com
2018-07-15 18:15:52 -07:00
Wang Jie 76c7725117
Update userns-remap.md 2018-07-06 17:46:02 +08: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
Vimal Raghubir 93b084adbb Refixed the grammar issues in docker-overview.md 2018-05-23 14:00:58 -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
Bryan Thornbury f32bbe902d Remove adjtimex. (#6032) 2018-05-10 09:40:37 -07:00
Constantin Galbenu c5c80569a0 Updated a broken link (#6650) 2018-05-10 09:01:30 -07:00
newbieof410 2ae44c1824 A typo in docker-overview.md (#6588) 2018-04-30 10:57:15 -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
Gionni 5bb6473a72 less is more - avoid cat to grep something. (#6383) 2018-04-06 11:07:06 -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
Gwendolynne Barr 1ad7485421
Repair postgres link (#6346) 2018-03-29 11:40:17 -07:00
Damien L-G 1d2b6f6fcd Update links to AppArmor's wiki (#6335) 2018-03-29 09:49:40 -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
gbarr01 f36f3ec156 Update engine API docs, fetch script, and matrix 2018-03-22 16:52:53 -07:00
gbarr01 cb157b3318 Update engine CLI docs, stubs, and TOC 2018-03-22 16:52:53 -07:00
Joao Fernandes 03e09ed114 Revert "Update engine CLI docs, stubs, and TOC"
This reverts commit 9e5ed3edd4.
2018-03-22 11:58:07 -07:00
Joao Fernandes c9dcb9733c Revert "Update engine API docs, fetch script, and matrix"
This reverts commit 119bda6e17.
2018-03-22 11:58:07 -07:00
gbarr01 119bda6e17 Update engine API docs, fetch script, and matrix 2018-03-22 11:14:27 -07:00
gbarr01 9e5ed3edd4 Update engine CLI docs, stubs, and TOC 2018-03-22 11:14:27 -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
Shane O'Grady a78f7d345f Fix typo (#6158)
maxumum -> maximum
2018-03-06 06:57:29 -08:00
John Gasper dd75c65162 Update https.md 2018-03-02 11:01:34 -08:00
John Gasper c1db5bd9a2 fixing a command's description
the command does not create a key, but generates a signed cert based on the CSR.
2018-03-02 11:01:34 -08:00
Jaume Casado Ruiz c267d4c1bf Fix typo in userns-remap.md 2018-03-02 10:54:50 -08:00
Corey Floyd d2ab708bff Update to fix typo in dotnetcore.md (#6042)
Fixed typo in step one of Build and run the Docker image
2018-02-23 15:34:37 -08:00
Drew Volz 374d240c6a Update security.md (#6037) 2018-02-20 16:00:49 -08:00
gbarr01 13be4ade89 Update engine API docs and fetch script 2018-02-08 13:54:12 -08:00
Misty Stanley-Jones a8e84a80e1 Restructure and rewrite network content 2018-02-07 11:31:02 -08: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 1b343beca4
Clean up information architecture (#5893)
- Move /engine/admin/ and /engine/userguide/ topics to /config/ and /develop/
- Get rid of some stub topics that are no longer needed
- Rename /engine/article-img/ to /engine/images/
- Mark ambassador linking topic as obsolete
- Flesh out multistage build topic
- Reorganize some terribly obsolete content in other files
2018-02-01 15:25:43 -08:00
Misty Stanley-Jones ad80c3de5f
Move storage docs into /storage (#5884) 2018-01-31 16:16:51 -08:00
Misty Stanley-Jones 72c6cbce38
Document an example for --with-registry-auth flag (#5882) 2018-01-31 13:55:42 -08:00
mrajphemi 288465b5fd Fix typo in user namespace docs (#5881)
There was a typo in a file name.
should be /etc/passwd not /etc/password
2018-01-31 13:03:54 -08:00
Misty Stanley-Jones e9be468ed2
Add info about setting config options (#5879) 2018-01-31 11:23:40 -08:00
lostsquirrel 719e1f387d Update build-bridges.md (#5875)
* Update build-bridges.md

this guide not work for me in 
`Linux ubuntu  4.4.0-87-generic #110-Ubuntu SMP Tue Jul 18 12:55:35 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux`
it must create the bridge device first, is this correct?

* Correct the example

No need to use `brctl` and no need to re-create the `br0` bridge since Docker creates it automatically and the whole point of this tutorial is to use a different bridge.
2018-01-31 10:16:26 -08:00
Misty Stanley-Jones 7ca66dc7aa
Doc that you need an initialized swarm for tutorial (#5871)
You need to initialize your swarm before starting a service on it.
2018-01-30 16:04:38 -08:00
whyun7892 a68b8ffdc1 Target ip in the config file needs to be changed (#5865)
* Target ip in the config file needs to be changed
2018-01-30 14:49:37 -08:00
Chris Williams ab581979f8 Update index.md (#5840) 2018-01-29 14:22:12 -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
leonblueconic 5f9fbe0c94 Update awslogs.md (#5816)
the [ and ] need to be escapped to avoid the folling docker error: 
docker: Error response from daemon: failed to initialize logging driver: awslogs could not parse multiline pattern key "[\\d{4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|[1,2][0-9]|3[0,1])T(?:[0,1][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]+00:00]": error parsing regexp: invalid character class range: `}-(`.
2018-01-25 18:05:57 -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
idi-ot 58a5e517c9 fix typo: 10000 -> 1000000 (ms in 1 sec) (#5769)
* fix typo?

Not sure if that's what was intended by the original author, but there are 1000000 microseconds in one second, not 10000.

* update example command as well
2018-01-19 11:46:53 -08:00
idi-ot cb6ed21e67 spacing + config.json -> daemon.json (#5771) 2018-01-19 11:45:33 -08:00
idi-ot cc27281482 fix typo: remove unnecessary newline (#5772) 2018-01-19 11:44:24 -08:00
idi-ot db747309d0 add spacing before grep command (#5780) 2018-01-19 11:39:11 -08:00
Charles Bushong 4d960712b8 Replacing emdash in sample code with dash (#5782)
(╯°□°)╯︵ ┻━┻
2018-01-19 11:38:46 -08:00
ada 2b1ab09694 Resolves https://github.com/docker/docker.github.io/issues/5785 (#5786) 2018-01-19 11:33:33 -08:00
Akim Demaille 218e1cbb23 Mac updates (#5762)
* Mac: fix name of the vm directory

Actually the directory name changed from vm to vms/0 (there has been
no release with vm, we may remove references to it).  This is for the
forthcoming 18.01 Edge release, but since it's already published we
should probably update now.

Signed-off-by: Akim Demaille <akim.demaille@docker.com>

* Toolbox: formatting changes

No user visible changes here, just making future diffs easier to read.

Signed-off-by: Akim Demaille <akim.demaille@docker.com>

* Toolbox: do not invite to remove ~/.docker

Docker for Mac uses that directory too.

Signed-off-by: Akim Demaille <akim.demaille@docker.com>
2018-01-18 09:37:00 -08:00
dragon788 d5518a9754 Fix typo in relative link to heading (#5765) 2018-01-18 09:34:19 -08:00
idi-ot 97066ff158 fix typo: container5 -> container6 (#5767) 2018-01-18 09:33:38 -08:00
idi-ot 5542754db3 fix type: umlimited -> unlimited (#5768) 2018-01-18 09:32:50 -08:00
Giancarlo Romeo ed3c93aadb Fix typo (#5740) 2018-01-16 12:12:10 -08:00
Marco Davalos 4d2e963b4e Removed unnecessary RUN command from Dockerfile.build in multistage-build.md (#5750) 2018-01-16 09:09:38 -08:00
Ben Wells cb3f9aced6 Wait after processes are launched to poll to see whether they have exited (#5686) 2018-01-12 13:32:18 -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
gbarr01 7c3df66e72 Add API v1.35 dir and update references 2018-01-02 17:13:00 -08:00
gbarr01 3950e84534 Update CLI reference files and TOC 2018-01-02 17:13:00 -08:00
Akim Demaille 757c140877 Mac: the disk image has moved (#5603)
* Mac: the disk image has moved

In the forthcoming release of Docker for Mac, the disk image is in
another directory (was needed for future changes).

Signed-off-by: Akim Demaille <akim.demaille@docker.com>

* Mac: FAQ: Promote "Disk Usage" questions

One level upper.

Signed-off-by: Akim Demaille <akim.demaille@docker.com>
2018-01-02 17:13:00 -08:00
gbarr01 22852c0b21 Update seccomp note and remove ref to Fedora 22 2018-01-02 17:13:00 -08:00
gbarr01 7fcb35b57f Add Fedora 27; Update refs to fc24 2018-01-02 17:13:00 -08:00
Misty Stanley-Jones 15eb7fe379 Swarm service isolation (#5564) 2018-01-02 17:13:00 -08:00
Misty Stanley-Jones 2b68553bf4 Document quota support for VFS driver (#5560) 2018-01-02 17:13:00 -08:00
dungeonmaster18 e90fbae9e4 Added documentation for fluentd plugin sub-second-precision flag
Signed-off-by: dungeonmaster18 <umesh4257@gmail.com>
2018-01-02 17:13:00 -08:00