Commit Graph

201 Commits

Author SHA1 Message Date
Wi1dcard f6deeeafd1
Remove non-sense angle brackets. 2019-02-06 00:24:12 +08:00
paigehargrave 0dab4ade68
Merge branch 'master' into name-change-for-Docker-Desktop 2019-01-14 11:14:48 -05:00
paigehargrave b47ac9ae3b
Update index.md 2019-01-11 16:10:52 -05:00
L-Hudson 387d1a14f7
Update index.md
Editorial crx
2019-01-10 11:45:35 -05:00
Maria Bermudez dba97175ff
Merge branch 'master' into patch-1 2019-01-10 06:48:27 -08:00
Maria Bermudez e6edbdd945
Merge pull request #7178 from adamancini/patch-8
Merging based on previous conversation
2019-01-02 13:42:00 -08:00
paigehargrave 2788a53481
Merge pull request #7728 from siyu6974/patch-1
Update example for deprecated name
2018-12-28 13:09:11 -05:00
Anne Henmi 30c6242a3e
Merge pull request #7624 from shin-/c4601-exclusive-external
Update docs for volume and networks about the changed behavior of the external key
2018-12-26 10:01:30 -07:00
Maria Bermudez c01ab3cbda
Clarify versions of secrets config samples 2018-12-19 17:19:42 -08:00
Maria Bermudez 500c265a09
Merge branch 'master' into patch-1 2018-12-18 13:27:43 -08:00
Siyu aac5701eae
Update index.md 2018-12-18 10:44:53 +01:00
Siyu c52e3c834e
Add back old example but mark as deprecated 2018-12-18 10:44:10 +01:00
Dima Tisnek 6dd9fa00e9 Document consistency flag in mounts 2018-12-11 12:46:25 +09:00
Siyu 915f740182
Update example for deprecated name
secret.external.name is deprecated in favor of secret.name
2018-11-20 12:43:08 +01:00
Henré Botha 5c0fe6c663
Fix ordering of service config reference 2018-11-12 14:57:27 +02:00
Joffrey F 2efd2456d7 Update docs for volume and networks about the changed behavior of the external key
in newer versions of the format

Signed-off-by: Joffrey F <joffrey@docker.com>
2018-11-06 16:02:54 -08:00
Oscar Caballero 269c80d2d9 Spelling revision 2018-09-23 21:43:11 +02:00
ada 5e8f7a25ab
NFS example for driver_opts
People ask me how to do this all the time, and I can't find a good example documented anyhwere else.  I figure this is a better example of the actual usage of the driver_opts parameter with a real-world use case.
2018-08-06 13:42:15 -04:00
Cameron Steffen 35cefb2f73
fix init example version 2018-07-31 04:11:26 -05:00
Tammy Fox 9a0cb8c058
Merge pull request #6975 from sascha-egerer/patch-4
Fix copy and paste error
2018-07-26 00:35:28 -04:00
Joffrey F caad3ebe13 1.22.0 release notes and documentation
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-07-05 13:32:51 -07:00
Sascha Egerer 1165708794
Fix copy and paste error
"networks" must be "volumes" at that place
2018-06-30 22:04:59 +02:00
Ben Creasy 14ef9244e3 Cannot find reference to --net
Is network intended? It looks like this is talking about https://docs.docker.com/engine/reference/run/#network-settings
2018-06-15 14:59:56 -07:00
Xander Marjoram 87c84916f3 Documentation typo fixes 2018-05-18 10:06:05 -07:00
Trapier Marshall 2a62bcf235 fix version in compose placement pref example (#6569) 2018-04-27 09:22:24 -07:00
Teoh Han Hui 37f9546e32 Quote port numbers when using short syntax
Comply with our own advice.
2018-04-23 10:39:45 -07:00
James Gentes a8b93a59ea Added note to 'ports' section: Port mapping is incompatible with `network_mode: host`
Took a while to figure this one out.  Source: https://github.com/docker/compose/issues/4799#issuecomment-299605031
2018-04-16 13:57:53 -07:00
rdxmb 246e8e2e3a DO-NOT-MERGE update the docs for using host-network (#6124) 2018-04-11 13:09:49 -07:00
Joffrey F d4e7eee27e Fix merge artifacts in vnext branch
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-11 10:45:28 -07:00
Joffrey F 8348f4ffb2 Document new Compose file additions
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-11 10:45:28 -07:00
Joffrey F aca2e9ce5f Document compatibility mode
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-11 10:45:28 -07:00
Joffrey F 1c58771f85 Use updated notes format
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-11 10:45:28 -07:00
Joffrey F 66a461ecf5 Document compatibility mode
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-11 10:45:28 -07:00
Joffrey F 0e2cc91765 Add cache_from to v2 reference (#6410) 2018-04-09 18:56:59 -07:00
Joffrey F 12757bf953 Compose 1.20.0 (#6266) 2018-03-20 11:23:36 -07:00
Gwendolynne Barr c39ddd656a
Repair arg example to match v2 (#6253) 2018-03-17 22:00:02 -07:00
Björn 9ba5248f1e Fix #5219: Change unsafe ARG example in compose file docs. (#5984) 2018-03-17 11:22:19 -07:00
Jeffrey M. Levesque 541e60ec16 #6215: compose-file-v2.md, fix 'version: 3.2' typo 2018-03-13 10:50:51 -07:00
Marcus Geißler 11c1b1c65f
Use Compose stop instead of down 2018-03-05 09:49:49 +01:00
Marcus Geißler 67f6404740 Add information on stop order
Documentation should also mention that compose takes dependency order into account for shutdown as well.
docker/compose#2679
2018-03-03 15:46:59 +01:00
Joffrey F 1ba03f1a34 Add build target to v3 reference (#6107) 2018-02-27 16:11:01 -08:00
Diego Rabatone Oliveira 2f0e2b684a Fix grammar error on compose-file index.md (#6070) 2018-02-25 09:03:19 -08:00
Misty Stanley-Jones d14a9f96fd
Doc that for 2.1+, overlay networks are attachable (#5967) 2018-02-08 15:58:45 -08:00
Joffrey F 2d12fdf671 Add docs for Compose file v3.5 and v3.6 (#5912)
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-08 13:54:12 -08:00
Steven Showers b7a9862728 Clarified max_attempts behavior (#5949) 2018-02-07 16:09:51 -08:00
Joffrey F 761d421b5c Fix typos (#5944)
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-07 13:18:54 -08:00
Joffrey F c399e1e479 Docs for Compose 1.19.0 release (#5826)
* Docs for Compose 1.19.0 release

Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-07 13:18:54 -08:00
ethan-haynes 074268b8ca added doc changes for upcoming tmpfs-mode 3.6 compose (#5777)
Signed-off-by: Ethan Haynes <ethanhaynes@alumni.harvard.edu>
2018-02-07 13:18:54 -08:00
Wadim Kruse b36b6d2c86 Fix restart policy description (#5927) 2018-02-06 09:02:36 -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