docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
45,528 Commits 16 Branches 28 Tags 812 MiB
Commit Graph

1038 Commits

Author SHA1 Message Date
Victoria Bialas 5591401a2d clarified Compose file topic structure, and file examples (#2322) 
copyedits, rewrite

fixed some links

simplified/shortened this topic

tweaked description of key, option, value

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-03-15 10:13:11 -07:00
Derek Bender 330ed3d24a fixup compose-file/index.md link (#2347) 2017-03-15 09:56:17 -07:00
Misty Stanley-Jones fb7c73908b Update the styleguide (#2332) 
* Update the styleguide

Also normalize admonition titles with the colon outside the bold.
 2017-03-15 09:46:30 -07:00
Victoria Bialas 9e244bbb9c added links to example of using overlay network in swarm mode (#2331) 
added more links re: overlay networks

provided more links to networking topics, restructured the section

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-03-14 18:46:44 -07:00
Daniel Nephin 37333c8fe8 Fix depends_on in Compose file v3 reference (#2278) 
* docker swarm does not respect depends_on

Swarmkit does not seem to have the concept of starting services in a particular order.

Tested with docker 1.13.1. Also, `docker-compose bundle` warns us about depends_on being unsupported.

* Remove condition form of depends_on from the V3 compose file docs.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2017-03-14 17:38:59 -07:00
Victoria Bialas d784ad5c1f added more detail for Compose env (#2310) 
incorporated Joffrey's comment

fixed heading levels

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-03-14 14:30:35 -07:00
Victoria Bialas f9d7107499 update to docker-compose rm reference per Compose v3 (#2288) 
corrected docs to reflect docker-compose version update

updates per Joffrey's comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-03-13 15:53:19 -07:00
Victoria Bialas 4b9493d276 fleshed out Machine scp command description, fixed Compose file notes (#2265) 
copyedit to fix typo

wrapped text properly

replaced original example with Nathan's

added a better sub-title

specifically mentioned not using relative paths

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-03-10 16:30:26 -08:00
Ryan Sanford a1ce533207 Update tail docs to match built-in docs (#2253) 
Default value for tail helps me remember it's not a switch, but requires a value. This change makes it match the built-in docs.
 2017-03-10 11:56:24 -08:00
Victoria Bialas 66d905032a Merge pull request #2239 from londoncalling/compose-startup-order-waitforit 
clarified scripts logic for compose startup order
 2017-03-09 17:10:54 -08:00
Victoria Bialas d1723bfe1f copyedit 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-03-09 16:59:17 -08:00
Misty Stanley-Jones a9bac844a5 Merge pull request #2160 from endlos/patch-2 
Update rails.md
 2017-03-09 15:45:09 -08:00
Victoria Bialas ec7774f46c clarified scripts logic for compose startup order 
changed 'note' to 'tip'

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-03-09 12:04:26 -08:00
Victoria Bialas a020b82489 fixed link to Compose v2 restart 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-03-08 18:26:52 -08:00
Hugo 7b83cfebab Update rails.md 2017-03-06 20:01:57 -05:00
Piyush Maurya b582d52d94 update v1.11.1 to v1.11.2 (#2102) 2017-03-06 12:06:06 -08:00
Victoria Bialas 00d60e3054 Merge pull request #1979 from flemzord/patch-1 
Change version for docker-compose
 2017-03-02 15:34:02 -08:00
Victoria Bialas 09c432495f clarified docker stack deploy and bundles 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-03-01 18:30:48 -08:00
Joe Meissler b93760bea5 merge other changes, fix typo 2017-03-01 15:01:26 -08:00
Joe Meissler 32e4923e32 Merge branch 'master' into patch-1 2017-03-01 15:00:00 -08:00
Joe Meissler 963e6b5e6c mem_swappiness for current version and v1 2017-03-01 14:56:18 -08:00
Joe Meissler 5c87ba4009 Add documentation for mem_swappiness 2017-03-01 14:48:19 -08:00
Misty Stanley-Jones a3b95e3f0c Merge pull request #1803 from mtoothman/patch-1 
Update run.md
 2017-03-01 14:24:53 -08:00
Victoria Bialas 1b05f61663 Added "related topics" section 2017-03-01 13:47:13 -08:00
Matt d53941fa43 Update run.md 
Address PR feedback.
 2017-02-28 21:30:53 -05:00
Maxence Maireaux 28b1897289 Update install.md 2017-02-25 21:12:12 +01:00
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
Matt fb0f9d56bc Update run.md 
Minor grammar cleanup.
 2017-02-16 22:20:42 -05: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