Commit Graph

275 Commits

Author SHA1 Message Date
John Mulhausen 4d93d1790b Fixes #1887 2017-02-22 13:56:50 -08:00
Misty Stanley-Jones 4576e1a6b7 Merge pull request #1921 from docker/fix-secrets-mode-doc
Fix error about permissions in secrets doc
2017-02-22 10:39:22 -08:00
Misty Stanley-Jones 33857cfe29 Tweaks 2017-02-22 09:49:09 -08:00
Misty Stanley-Jones 85bcea8ac1 Fix error about permissions in secrets doc
Also link to a resource for figuring out the right mode, since not all our readers are UNIX gurus.
2017-02-22 09:45:56 -08:00
Joffrey F 3e4005c360 Updated miscellaneous list of options for each format
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-21 13:11:37 -08:00
Misty Stanley-Jones ef4671f75e Document secrets in compose file reference 2017-02-21 09:09:32 -08:00
mapk0y edfcf0c485 fix broken links in composer-file/index.md (#1857)
Signed-off-by: mapk0y <mapk0y@gmail.com>
2017-02-20 02:48:33 -08:00
Victoria Bialas f36ad2fa3a fixed link in Compose file, expanded on-page TOC's to show more subtopics
fixed a link to variable substition in Compose v.3

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-17 14:07:32 -08:00
Victoria Bialas 49323a1137 edit per Joffrey re: PR #1763
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-16 18:20:09 -08:00
Victoria Bialas 0396353b08 Merge pull request #1763 from Electron-libre/master
fix(compose:extends): not supported from version 3
2017-02-16 16:35:21 -08:00
Roque Pinel be682d4f42 Fix startup-order.md link (#1769) 2017-02-16 14:48:46 -08:00
John Mulhausen 989b3a7113 Update compose-versioning.md 2017-02-16 11:54:32 -08:00
Cedric Brancourt 0f4a08f916 fix(compose:extends): not supported from version 3 2017-02-16 19:39:23 +01:00
Devis Lucato 73662f59cb Fix broken links
Fix the broken links at the bottom of https://docs.docker.com/compose/compose-file/ page
2017-02-14 10:47:06 -08:00
Misty Stanley-Jones 404fa2295a Merge pull request #1608 from joaquincasares/patch-1
Update index.md
2017-02-13 16:51:44 -08:00
Misty Stanley-Jones 4e9553176f Merge pull request #1630 from ifraixedes/patch-1
Fix yml file in compose alias example
2017-02-13 16:44:07 -08:00
Misty Stanley-Jones 6cbbf69ca0 Merge pull request #1636 from shin-/v3-network-config
Remove unsupported IPAM config entries in v3
2017-02-13 16:41:58 -08:00
Josh Wyatt d5f60821fd Correct misspelling 2017-02-13 12:37:17 -08:00
Joffrey F 11f7db62e5 Remove unsupported IPAM config entries in v3
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-13 12:14:50 -08:00
Ivan Fraixedes e7f6f5ab36 Fix yml file in compose alias example 2017-02-13 16:21:37 +01:00
Joaquin Casares 483d318528 Update index.md 2017-02-10 19:16:53 -06:00
Victoria Bialas 1db710d8f3 compose copyedit
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-10 14:18:32 -08:00
Victoria Bialas b7dfc2921e re-wording, copy-edit 2017-02-09 22:43:37 -08:00
Victoria Bialas 2b7c238b0c copyedits and improvements to Compose reference
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-09 19:40:27 -08:00
Victoria Bialas 55b004036a added drafts of versioned compose reference files
pruning Compose file v2 reference

updated Compose v1, v2, v3 files, still WIP

added includes for compatibility matrix, fixed TOC menu

new topic organziation Compose reference, split two 3 files plus versioning

Daniel's comments, fixed links, added more to versioning details

fixed volumes_from example per Daniel's comments for v1

simplified links to version references

copyedits and improved/surfaced links to versioning/upgrade docs

removed for version specific content re: volume_drivers from various files

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-09 17:39:08 -08:00