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
93709c2b12
Merge pull request #1900 from shin-/missing_options_composefileref
...
Updated miscellaneous list of options for each format
2017-02-22 10:13:39 -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
Misty Stanley-Jones
9578525701
Merge pull request #1853 from knaperek/patch-1
...
Clarify compatibility of "networks" with more recent versions of compose.
2017-02-22 09:35:06 -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
Jozef
3083031907
Update networking.md
...
Clarify compatibility of "networks" with more recent versions of compose.
2017-02-18 20:16:35 +01:00
Victoria Bialas
4a70dd4cb2
removed on-page topic menu from ref pages
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-17 18:02:58 -08:00
Victoria Bialas
a6eb34f018
added x-ref from scale reference to replicas in v3 Compose
...
incorporated Joffrey's comments
surface h1's in left menu on Compose file refs, fix liquid issue
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-17 17:23:52 -08:00
Andy Bulford
5160f1cf0b
Remove 1.10.0 references from install.md
...
These were missed from PR #1819 so also needed updating to 1.11.1.
2017-02-17 14:30:45 -08:00
Victoria Bialas
d9e2d542ca
Merge pull request #1831 from londoncalling/compose-restart-link
...
fixed link in Compose file, modified on-page TOC
2017-02-17 14:18:57 -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
Andy Bulford
a09e279035
Update install.md to refer to version 1.11.1
2017-02-17 13:11:25 -08:00
Victoria Bialas
40f912237b
Merge pull request #1802 from londoncalling/Compose-extends-update
...
edit per Joffrey re: PR #1763
2017-02-16 18:37:30 -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
e845620aaf
fixed nav menus to surface Compose file reference, changed links to several manuals to overviews
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-16 18:06:05 -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
Dirk
d8d822adff
Added a bit more detail to restart.md ( #1668 )
...
This killed me for a while, I expected that since environment variables were set after the build process that they would be reloaded on restart.
2017-02-16 16:00:24 -08:00
Roque Pinel
be682d4f42
Fix startup-order.md link ( #1769 )
2017-02-16 14:48:46 -08:00
Victoria Bialas
03464b70cb
changed `version 3` to `version 3.x` per Joffrey
2017-02-16 14:37:03 -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
Tarun Chinmai
06583c91d9
Changed the `rails` command to `rake`
...
changed `rails db:create` to `rake db:create`
2017-02-15 22:14:18 +05:30
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
b9f6524a28
Merge pull request #1603 from londoncalling/compose-and-docker-run
...
compose copyedit
2017-02-10 14:54:31 -08:00
Victoria Bialas
1db710d8f3
compose copyedit
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-10 14:18:32 -08:00
John Mulhausen
9abc9e9f41
Add documentation for new top command ( #1534 ) ( #1601 )
...
Update command lists to include recent additions
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-10 13:59:06 -08:00
Victoria Bialas
19b5b6ad9e
clarified getting started Compose topics based on user feedback
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-10 11:49:52 -08:00
Marko Schulz
107be08421
Small documentation fix
...
There are four files (`Dockerfile`, `Gemfile`, `Gemfile.lock`, `docker-compose.yml`) described for the setup.
2017-02-10 12:29:47 +01: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
pedep
be447bf1b5
Fix markdown rendering of example configuration ( #1544 )
...
* fix code block formatting after list
add comment between code block and list to fix markdown rendering
* Update compose-file.md
* Update compose-file.md
2017-02-08 15:49:14 -08:00
Juan Eugenio Abadie
91cc808b23
Fix link ( #1392 )
2017-01-26 14:12:28 -08:00
Michael Friis
2fb946b8f0
fix anchors ( #1381 )
...
signed-off by Michael Friis <friism@gmail.com>
2017-01-26 02:58:54 -08:00
Victoria Bialas
bfbfbeeec5
added missing descriptions for update_config options
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-25 14:31:07 -08:00
Misty Stanley-Jones
ef95a915eb
Fixing broken links
...
Formatting improvements along the way
2017-01-25 11:51:14 -08:00
Juan Eugenio Abadie
2f472446a1
Add udp ports example ( #1098 )
2017-01-24 15:49:44 -08:00
Nick van der Meij
bb81ccb937
Update envvars.md ( #1008 )
...
* Update envvars.md
Update envvars.md to reflect the supported values of COMPOSE_CONVERT_WINDOWS_PATHS
* Update envvars.md
2017-01-24 15:37:06 -08:00
Zhe Zhang
cf42e71f2e
update compose install to 1.10.0 ( #1314 )
2017-01-24 14:48:37 -08:00