Commit Graph

1062 Commits

Author SHA1 Message Date
xufei100 a8a33c1d07 Update compose-file-v2.md (#2702)
fix wrong link
2017-04-10 12:40:09 -07:00
Victoria Bialas 49c5bd7b6e updates for Compose group_add example (#2684)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-04-07 12:45:19 -07:00
Victoria Bialas 61aa60d039 clarified relationship btwn scale and replicas (#2683)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-04-07 11:38:21 -07:00
Jim Galasyn 1654a09c72 Fix broken samples link (#2682)
Replaced missing samples link with links to Getting Started and GitHub example files
2017-04-07 10:22:44 -07:00
mrfly 8316c1d0be There is a colon omitted in this section. (#2631) 2017-04-06 15:33:20 -07:00
Victoria Bialas 5f14289a3f added note re: VitualBox bug and Compose example (#2652)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-04-06 13:41:12 -07:00
Misty Stanley-Jones 2f4355c22a Fix compose links (#2624) 2017-04-04 15:03:50 -07:00
Misty Stanley-Jones 4fd4685ec5 Fix 404 (#2622) 2017-04-04 15:03:02 -07:00
Misty Stanley-Jones 3833596740 Adjust heading level (#2620) 2017-04-04 14:26:45 -07:00
Wang Jie 75d5a853e2 Update production.md (#2590)
* Update production.md

* Update production.md
2017-04-03 15:23:03 -07:00
Wang Jie d2974a5d3b Update startup-order.md (#2591) 2017-03-31 23:42:38 -07:00
Wang Jie a3417b8126 Update install.md (#2574) 2017-03-31 15:31:02 -07:00
Wang Jie a5502b4235 Update gettingstarted.md (#2576) 2017-03-31 14:22:01 -07:00
Wang Jie 15924442bb Update install.md (#2577) 2017-03-31 14:20:56 -07:00
Wang Jie 2b009778e3 Update overview.md (#2578) 2017-03-31 14:20:30 -07:00
Wang Jie fd5090abb4 Update envvars.md (#2579) 2017-03-31 14:16:58 -07:00
Wang Jie 0078fcb96b Update overview.md (#2554) 2017-03-30 16:56:47 -07:00
Misty Stanley-Jones c6aca8acee Improve bootstrap tabs (#2546)
Use data-target instead of href
Move tab-syncing code into site-wide JS so everyone can use it
Add example for syncing tab groups on the same page
2017-03-30 12:57:37 -07:00
Misty Stanley-Jones 669b51a889 Fix broken links (#2521) 2017-03-28 16:42:44 -07:00
Victoria Bialas 93bab5a66f Vnext compose (#2509)
* Adds documentation about the `--ignore-override` option

For PR https://github.com/docker/compose/pull/4543

When option `--ignore-override` is provided the `docker-compose.override.yml`
file, if it exists, will not be considered for any command. This option
has no effect when the `-f` option is used as that explicitly lists the
set of files to be considered.

Signed-off-by: Dennis Gove <dpgove@gmail.com>

* Compose 1.12.0 additions (#2472)

* Add mem_reservation to list of v2 options

Signed-off-by: Joffrey F <joffrey@docker.com>

* Add dns_opt to v2 service configuration

Signed-off-by: Joffrey F <joffrey@docker.com>

* Add pids_limit to service configurations

Signed-off-by: Joffrey F <joffrey@docker.com>

* Update list of options for docker-compose rm

Signed-off-by: Joffrey F <joffrey@docker.com>

* Update list of options for docker-compose config

Signed-off-by: Joffrey F <joffrey@docker.com>

* Add --exit-code-from to docker-compose up documentation

Signed-off-by: Joffrey F <joffrey@docker.com>

* Add --parallel to docker-compose pull reference

Signed-off-by: Joffrey F <joffrey@docker.com>

* Add build-args to docker-compose build reference

Signed-off-by: Joffrey F <joffrey@docker.com>

* Add --volume to docker-compose run reference

Signed-off-by: Joffrey F <joffrey@docker.com>

* Add --project-directory to list of docker-compose options

Signed-off-by: Joffrey F <joffrey@docker.com>

* Add reference docs for images command

Signed-off-by: Joffrey F <joffrey@docker.com>

* Add documentation for COMPOSE_PATH_SEPARATOR

Signed-off-by: Joffrey F <joffrey@docker.com>

* Add documentation for cache_from option

Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-28 10:50:44 -07:00
Daniel Nephin add1325878 Add ports and volumes long form syntax to compose-file reference (#2283)
* Add long form for ports.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>

* Remove volume_driver from v3 reference.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>

* Add docs for expanded mount syntax.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-03-27 20:49:00 -07:00
Victoria Bialas 2f14b6ea51 added compose file example in accordion (#2477)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-24 19:48:19 -07:00
Joffrey F f6c62c3934 Typo in compose overview page (#2445)
Add missing space.
2017-03-22 17:53:32 -07:00
Mateusz Kurek 92523b274e Fix external links from compose file docs (#2401)
Compose file v1 and v2 docs had relative links to some non-existing pages (especially about extending services). It was probably introduced when `compose-file.md` was detached into directory with single file per compose file version.
2017-03-21 11:55:35 -07:00
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