Commit Graph

131 Commits

Author SHA1 Message Date
Misty Stanley-Jones
52de4ef650 Revert "Document order option in update_config (#5089)" (#5105)
This reverts commit 6c5c888882.
2017-10-25 10:04:24 -07:00
Dave Henderson
6c5c888882 Document order option in update_config (#5089) 2017-10-24 16:30:03 -07:00
Joffrey F
995db08193 Add documentation for scale parameter (#5065)
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-20 16:42:02 -07:00
Misty Stanley-Jones
2eb70ea3c2 Add info about network: host (#4959) 2017-10-20 16:17:45 -07:00
Misty Stanley-Jones
d8adc37e74 Revert "Document new features in Compose 1.17 (#5019) (#5021)" (#5038)
This reverts commit 52fe0df34b.
2017-10-18 16:07:20 -07:00
Misty Stanley-Jones
52fe0df34b Document new features in Compose 1.17 (#5019) (#5021)
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-17 21:17:28 -07:00
John Mulhausen
6e2f94daf6 Revert "improve links from v2.1 (#4991)" (#5015)
This reverts commit 62b05a1040.
2017-10-17 15:13:56 -07:00
Godefroid Chapelle
62b05a1040 improve links from v2.1 (#4991)
- fix link_local_ips and pids_limit
- more specific links to volume and network labels, volume name
2017-10-17 13:27:10 -07:00
Misty Stanley-Jones
06c3b7cd34 Add docs for attachable key in composefile (#4957) 2017-10-13 16:00:56 -07:00
Misty Stanley-Jones
26ab6617b4 Backport note about links being legacy (#4956) 2017-10-13 16:00:26 -07:00
Misty Stanley-Jones
990a5be262 Cross-linking between compose and configs/secrets (#4869) 2017-10-10 11:08:51 -07:00
Gilad Peleg
25ed66a2c5 Make sure code example is correctly presented (#4839) 2017-10-09 17:01:57 -07:00
Misty Stanley-Jones
0201df7716 Clarify that enable_ipv6 requires v2 Compose file (#4811) 2017-10-05 12:15:03 -07:00
Victoria Bialas
6db50d4591 clarified Compose resource options for v2, v3 (#4712)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-09-25 13:37:09 -07:00
Sébastien HOUZÉ
0c9ad498f9 Add tmpfs as mount type (#4704)
tmpfs was missing in the mount types of volumes long syntax.
2017-09-25 11:30:50 -07:00
Santiago Petrone
4204df859d Indentation fix (#4491) 2017-09-19 11:09:53 -07:00
rdxmb
207acedee2 healthcheck examples - considers valid exit codes (#4652)
As the exit codes for healthcheck must be 0 or 1 , these examples take care about that.
(curl could also exit with another code != 1)
2017-09-19 10:26:53 -07:00
Victoria Bialas
02fc66fde8 More info on resource constraints in Compose v3 and v2 (#4651)
* added more info about resource constraints to Compose docs

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

* fixed link in Compose docs, added instructions in test for adding custom target link link IDs

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

* fixed links

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-09-18 16:02:05 -07:00
Gwendolynne Barr
1d20f44618 Indent services in compose file (#4611) 2017-09-13 13:27:59 -07:00
Juan Pablo Picasso
d92a15dbc9 fixed link to dns section (#4448) 2017-09-11 09:54:43 -07:00
Joffrey F
0b22c35a28 Remove delayed features from 1.16.0, fixed changelog (#4417) 2017-08-31 15:52:18 -07:00
Joffrey F
0702f23aae Document Compose 1.16.0 additions (#4293)
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-31 15:52:18 -07:00
Yong Wen Chua
563c564d4c Document Docker Compose Version 2.3 (#3994)
And the new "target" parameter under "build"

Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
2017-08-31 15:52:18 -07:00
Wenxuan Zhao
4d43ae7ea2 Fix depends_on links across documents. (#4424)
NOTE: compose file v1 doesn't support `depends_on`,
      thus it's still a broken link.

Signed-off-by: Wenxuan Zhao <viz@linux.com>
2017-08-29 15:52:02 -07:00
Victoria Bialas
7e0033575a clarified links and services communication in Compose (#4416)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-08-29 10:16:47 -07:00
Alon Bar Tzlil
c5e28b8412 Fix file version in volumes long syntax example to 3.2 (#4202)
Fix docker-compose file version in the example given for the new volumes "long syntax", available from version 3.2.
Currently the example contains version 3 which does not support this syntax.
2017-08-17 14:43:03 -07:00
Brikou CARRE
b812b9d775 Fix rendering of YAML snippet (#4185) 2017-08-17 14:14:52 -07:00
Joffrey F
45ac9fe357 Add clarification on env_file / environment interaction (#4177)
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-17 14:09:43 -07:00
Sebastiaan van Stijn
4c41debee6 Fix credential-spec documentation (#4179)
The values that are provided in the docker-compose file
should be relative, not absolute.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-08-15 10:43:00 -07:00
Sebastiaan van Stijn
587248348c Remove warning for limitation in Docker 1.13.1 (#4180)
Docker 1.13.1 is EOL, and no longer supported, so
this warning is a bit redundant now.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-08-14 11:26:52 -07:00
cthomas15
fad97596eb Changes to compose/compose-file/index.md (#4172)
Added 'rollback' to the list in the following bullet:
- `failure_action`: What to do if an update fails. One of `continue`, `rollback`, or `pause` (default: `pause`).
2017-08-11 16:20:22 -07:00
James Guthrie
e09f7063cb Remove superfluous sentence from compose-file docs (#4154) 2017-08-10 15:52:16 -07:00
Victoria Bialas
65fdf795f4 Fix Compose file samples for volumes and other (#4142)
* Fix Compose file samples for volumes and other

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

* fixing Compose file example, adding another volume mount example

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

* replaced x-ref to volumes info with the right one

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

* add bullets to note

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

* corrected for description of bind mount as example intro

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

* modified volumes example per developer review

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

* corrected for legacy stuff on examples, clarified named volumes

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

* fixed capitalization in x-refs visible text

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-08-10 14:49:55 -07:00
Victoria Bialas
4be0abd93b surface Compose file example at top of topic (#4090)
* surface Compose file example at top of topic

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

* removed extraneous intro

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-08-03 21:22:47 -07:00
ryota-murakami
24d6f9b1f7 fix typo (#4031) 2017-08-01 12:16:34 -07:00
Victoria Bialas
a922be3d0f Update admonitions CSS for consistency and better writer workflow (#4019) 2017-07-31 21:49:56 -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
Victoria Bialas
eb25815fb9 Better examples to show Compose file structure, expand/collapse accordion (#3967)
* better examples to show Compose file structure

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

* cleaned up leading spaces in Compose file example

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

* cleaned up leading spaces, added a test file

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

* expand/collapse accordion full implementation, explanation in test.md

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

* delete temporary test file from PR

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

* fix accordion to work on mobile (cursor style)

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

* verified fix for mobile worked, added same to test.md, updated notes and content

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

* Clarifed details on test page, fixed references for FontAwesome icons

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-07-28 12:32:53 -07:00
Victoria Bialas
52644895c0 added suggested new example to the include
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-07-27 11:09:03 -07:00
dark0dave
a97df05f5b Update compose-file-v2.md 2017-07-27 11:09:03 -07:00
dark0dave
be2dcf2909 Update compose-file-v2.md
Missing Documentation
2017-07-27 11:09:03 -07:00
Joffrey F
181a0c6346 Compose 1.15.0 additions (#3950)
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-26 16:08:44 -07:00
tahia
d0f6397a9e Specify Compose version for Compose file formats (#3297)
* Specify Compose version for Compose file formats

Explicitly specifying Compose versions file formats 2.1 and 2.2.

* corrected typo 2.1 --> 2.2

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-07-26 16:08:44 -07:00
Victoria Bialas
3558712894 added endpoint_mode topic for Compose file v3.3 (#3982)
* added endpoint_mode topic for Compose file v3.3

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

* incorporated review comments re: features and versioning

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-07-26 10:33:46 -07:00
Victoria Bialas
1c6ff26042 added Compose topics on caching options for performance (#3932)
* added Compose topics on caching options for performance

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

* updated title for Compose topic

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

* line wrap per review

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-07-21 15:52:41 -04:00
Adrian Moisey
39dd81ec91 Fix example of "configs" (#3807)
This should be "configs" not "secrets" as it's an example of the new "configs" option.
2017-07-05 16:45:55 -07:00
Victoria Bialas
c2bd959d1f env file list precedence Compose file (additional clarification) (#3822)
* clarified ordering of env files

* added env_file order of precedence to v1, v2 Compose

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

* formatting

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-07-05 13:43:42 -07:00
Victoria Bialas
d2b71ad555 clarified Mac vs. Linux steps on bash completion (#3800)
* clarified Mac vs. Linux steps on bash completion

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

* copyedit on Compose file reference page

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-07-03 16:26:54 -07:00
Victoria Bialas
88bb7acbd5 expanded on explanation in note re: extends supported versions (#3696)
* expanded on explanation in note re: extends supported versions

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

* copyedits

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

* x-ref to open issue to bring back extends

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

* added more x-refs to note on extends

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-29 11:57:03 -07:00
Misty Stanley-Jones
08f830811d Add configs to compose file reference 2017-06-28 08:31:29 -07:00