Commit Graph

30 Commits

Author SHA1 Message Date
Joffrey F efb8c5e492 Update instructions for IPv6-enabled networks
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-17 15:43:52 -08:00
LRubin a3a53fc3ff more more link link fixes fixes
Signed-off-by: LRubin <lrubin@docker.com>
2017-01-11 15:02:28 -08:00
Dan Keder 36ac04c1fa Add a note to `env_file` option (#932)
* Add a note to `env_file` option
2016-12-19 15:02:42 -08:00
Victoria Bialas d0b903fc07 Revert "Update Compose file reference for version 3" 2016-12-16 14:32:39 -08:00
Victoria Bialas 7f291684ad Merge pull request #716 from aanand/compose-file-v3
Update Compose file reference for version 3
2016-12-16 14:11:32 -08:00
Aanand Prasad d9efcc4df1 Add note about .env file to variable substitution docs (#801)
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-12-06 16:41:21 -08:00
Aanand Prasad 9407f9ef05 Update docs around entrypoint option (#712)
- Clarify that setting `entrypoint` overrides both the entrypoint and
  the command on the image

- Fix the incorrect examples in the doc on startup order, which assumed
  that the default command would not be overridden

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-12-06 16:40:12 -08:00
Aanand Prasad 8524552f99 Update Compose file reference for version 3
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-29 17:53:11 +00:00
Rares Vernica 2d813e26fd Fix link to link_local_ips 2016-11-28 13:40:17 -08:00
Victoria Bialas a259f45166 clarified use of .yml and .yaml for Compose file, both can be used
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-11-18 12:21:51 -08:00
Victoria Bialas b2eb693d00 Merge remote-tracking branch 'upstream/master' into vnext-compose-1.9.0-merge 2016-11-16 12:03:45 -08:00
Gaetan 2ea564166d fix type of keywords entry in frontmatter (in /compose/ dir) (#481)
keywords should be a string, not an array containing one string

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-07 13:18:56 -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 ac0cef5d0f Merging master into vnext-compose
includes conflict resolution

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-04 15:25:34 -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
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
Joffrey F 4c3cf8e7fd Update docs to mention new additions in Compose 1.9.0
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-03 15:05:24 -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
Victoria Bialas 980956ef9d incorporated misty's comments
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-10-31 12:43:52 -07:00
Markus Schulte 1de1d10073 At paragraph "links", fixed anchor-link to "depends-on" 2016-10-24 12:01:00 +02:00
nVitius bb7661a926 Document Compose's syntax for variable defaults
This feature was not supported previously, but
was added in https://github.com/docker/compose/pull/3108
2016-10-12 09:50:40 -07:00
John Mulhausen 8ea375e1d7 Fix for list in compose-file, CSS fixes for blockquotes 2016-10-07 13:48:23 -07:00
sixcorners 9a2be62bf8 Update compose-file.md
Document that the journald logging driver allows docker-compose logs to work.
2016-10-05 11:40:42 -05:00
John Mulhausen 0133cb646d Merge pull request #21 from pborreli/typos
Fixed typos
2016-09-30 11:51:42 -07:00
John Mulhausen 066b78bf86 Content rendering fixes 2016-09-30 01:51:56 -07:00
Pascal Borreli 6cd3fe8bd2 Fixed typos 2016-09-30 01:52:12 +01:00
Misty Stanley-Jones d53c6798c9 Convert TOML to YAML, tweaks to work with Jekyll 2016-09-29 17:16:03 -07:00
Misty Stanley-Jones 701f170a21 Move docker-hub docs to docker-hub subdirectory 2016-09-29 10:38:52 -07:00
Misty Stanley-Jones 7629f462d5 Moved compose docs to compose subdirectory 2016-09-28 14:52:24 -07:00