Commit Graph

1419 Commits

Author SHA1 Message Date
Christian Klaussner f769463646 Explain how `volumes` and `devices` are merged (#5852) 2018-01-29 15:45:25 -08:00
Misty Stanley-Jones a55ddf60a9
Move /engine/installation to /install (#5651)
* Move /engine/installation to /install

* Add Docker for IBM Cloud to the matrix
2018-01-26 10:29:14 -08:00
Magnus Klingenberg 3e7bd5d26f Fix typo in build.md (#5821) 2018-01-25 18:00:00 -08:00
Misty Stanley-Jones a4f5e30249
Various copyedits to reduce future tense, wordiness, and use of 'please' (#5788)
* Reword lots of instances of 'will'

* Reword lots of instances of won't

* Reword lots of instances of we'll

* Eradicate you'll

* Eradicate 'be able to' type of phrases

* Eradicate 'unable to' type of phrases

* Eradicate 'has / have to' type of phrases

* Eradicate 'note that' type of phrases

* Eradicate 'in order to' type of phrases

* Redirect to official Chef and Puppet docs

* Eradicate gratuitous 'please'

* Reduce use of e.g.

* Reduce use of i.e.

* Reduce use of N.B.

* Get rid of 'sexagesimal' and correct some errors
2018-01-25 17:37:23 -08:00
Bret Fisher ead81f511c Add restart to options not supported in stacks (#5680)
- added restart to list of sub-options not supported in stack deploy
- added note to the bottom of restart description that it isn't supported in stack deploy, and to use restart_policy instead.
2018-01-18 09:40:52 -08:00
Daniel Nephin a83592ddaf Update compose reference for name fields (#5755)
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2018-01-16 14:15:05 -08:00
Glenn O. Larsen 4626e6ed23 Document 'start_period' option in healthcheck (#5735) 2018-01-16 14:14:33 -08:00
Emiliano 'AlberT' Gabrielli 0b37cb6a4e Fix extends.md URL (#5717) 2018-01-11 09:15:08 -08:00
new-guy 21c517a026 Note about setting ipv4/ipv6 not working in swarm (#5466)
* Note about setting ipv4/ipv6 not working in swarm

I spent a few hours yesterday assuming this was possible, but it turns out it isn't.  Hopefully this will help prevent others from making the same mistake I did.
2018-01-08 12:30:35 -08:00
mouhamed 9a2141cf78 Use `docker container create` instead of `docker run` (#5667)
In this context, I think `docker container create` is more suitable and more respectful to the new syntax and better analogy with `docker network create` and `docker volume create`
2018-01-05 10:59:15 -08:00
Alex Finnarn f57b348089 Update Example To Use Version 3 (#5662) 2018-01-03 16:52:15 -08:00
Peter Kokot 4c9fae8e23 Fix anchor link (#5639) 2018-01-02 10:01:49 -08:00
Joffrey F 1f36a5274f Update getting started guide with retry-loop and short explanation (#5635)
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-27 12:59:22 -08:00
Paul Verest c63fe4bf8a /compose/install/#alternative-install-options (#5616)
/compose/install/#alternative-install-options  link does not work, so add "tab above" words
2017-12-27 11:18:01 -08:00
x1ah 310a9f8f8c fix docker-compose.yml have not link redis (#5602)
rt, if web have not link redis, `redis = Redis(host='redis', port=6379)` will can not recognize the host('redis')
2017-12-26 12:52:27 -08:00
Dan Nissenbaum 2abb491a2d A frustrating typo (#5605) 2017-12-26 12:39:36 -08:00
Logan Rakai 1ff98b6467 Typo Correction (#5550) 2017-12-18 15:37:13 -08:00
Joffrey F 44bacb4ed2 Update compose-versioning file with newer additions
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-18 15:11:03 -08:00
Joffrey F 6e4339fc4d Update Compose docs to reflect changes in 1.18 release
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-18 15:11:03 -08:00
Misty Stanley-Jones 0793f49593 Document new features in Compose 1.17 (#5019) (#5021)
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-18 15:11:03 -08:00
Gwendolynne Barr 2295624399
Add link to non-root user help (#5544) 2017-12-15 19:54:12 -08:00
Gwendolynne Barr e2ea9531a6 Emphasize existing placement preference code (#5531) 2017-12-15 16:13:19 -08:00
Gwendolynne Barr 7ac30bb1af Add legacy link warning (#5535) 2017-12-15 16:12:15 -08:00
Gwendolynne Barr 9e57cf9edd Repair link (#5536) 2017-12-15 16:11:00 -08:00
ada 26ea6f3250 Remove dns & dns_search from "unsupported in compose v3"
6b60a60729 adds support for custom dns and dns_search settings to 'stack deploy'.

Tested on my lab in 17.06 with the following docker-compose.yml:

```
version: "3"
services:
  bb1:
    image: busybox
    command: nslookup google.com
    dns: 8.8.8.8

  bb2:
    image: busybox
    command: nslookup google.com
```
results in:
 ```docker service inspect --format "{{ .Spec.TaskTemplate.ContainerSpec.DNSConfig }}" bbdns_bb1
{[8.8.8.8] [] []} ```

```
 ada@trogdor  ~/docker/docker-ee   17.06  git --no-pager log --all --grep 6b60a60729e0b22cc74197e5d00d1621435da7f7
commit 7254b7d7835250677ba58a10127b51e6db61c4ce
Author: Benjamin Boudreau <boudreau.benjamin@gmail.com>
Date:   Thu Mar 23 19:38:17 2017 -0400

    Adding support for dns in stack files

    Signed-off-by: Benjamin Boudreau <boudreau.benjamin@gmail.com>
    Upstream-commit: 6b60a60729e0b22cc74197e5d00d1621435da7f7
    Component: engine
 ada@trogdor  ~/docker/docker-ee   17.06  git --no-pager tag --contains  7254b7d78v17.06.0-ce
v17.06.0-ce-rc1
v17.06.0-ce-rc2
v17.06.0-ce-rc3
v17.06.0-ce-rc4
v17.06.0-ce-rc5
v17.06.1-ce-rc1
v17.06.1-ee-1
v17.06.1-ee-1-rc1
v17.06.1-ee-1-rc2
v17.06.1-ee-1-rc3
v17.06.1-ee-1-rc4
v17.06.1-ee-2
v17.06.1-ee-2-rc1
v17.06.1-ee-2-rc2
v17.06.2-ee-3
v17.06.2-ee-3-rc1
v17.06.2-ee-4
v17.06.2-ee-4-rc1
v17.06.2-ee-4-rc2
v17.06.2-ee-4-rc3
v17.06.2-ee-5
v17.06.2-ee-5-rc1
v17.06.2-ee-5-rc2
v17.06.2-ee-6
v17.06.2-ee-6-rc1
v17.07.0-ce-rc1
v18.01.0-ee-1-tp3
v18.01.0-ee-1-tp4
v18.01.0-ee-1-tp5 
```
2017-12-14 15:06:43 -08:00
Lachlan Cooper a2a6db7716 Fix parameter links in compose-versioning.md 2017-12-13 15:59:45 -08:00
chan24092005 b2663493d1 Update django.md (#5477)
docker-compose should run with `sudo`, otherview it will be fail without the sudo permission
2017-12-11 13:32:40 -08:00
chan24092005 2230bedd84 Update django.md (#5476)
remove the extra s in `Dockerfiles`
2017-12-11 13:30:43 -08:00
Laura Frank 5701d86f06 Add example for `preferences` under deploy `placement` (#5415) 2017-11-30 13:55:52 -08:00
jottr 27b1e00875 USE COPY statement instead of ADD (#5336) 2017-11-20 10:02:20 -08:00
Alexandre Rio d0cab2a0d5 Use valid CPU limits (#5272)
Use 50% and 25% CPU limits instead of invalid 0.001. Fix #5271
2017-11-10 12:25:21 -08:00
Dave Henderson a38c5a6f9f Document order option in update_config (#5089) 2017-11-01 18:40:56 -07:00
Misty Stanley-Jones a9314c7ec7 Document new features in Compose 1.17 (#5019) (#5021)
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-01 18:40:56 -07:00
Misty Stanley-Jones 52de4ef650 Revert "Document order option in update_config (#5089)" (#5105)
This reverts commit 6c5c888882.
2017-10-25 10:04:24 -07:00
Dave Henderson 6c5c888882 Document order option in update_config (#5089) 2017-10-24 16:30:03 -07:00
Osaetin Daniel bd8675fba1 Update startup-order.md (#4907) 2017-10-23 17:23:06 -07:00
Joffrey F 995db08193 Add documentation for scale parameter (#5065)
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-20 16:42:02 -07:00
Misty Stanley-Jones 2eb70ea3c2 Add info about network: host (#4959) 2017-10-20 16:17:45 -07:00
Gwendolynne Barr 484e0de1b0 Update environment-variables.md 2017-10-18 19:14:06 -07:00
Misty Stanley-Jones bece1296f6 More improvements 2017-10-18 19:14:06 -07:00
Wang Jie a72e278983 Update networking.md 2017-10-18 19:14:06 -07:00
Wang Jie 51409b5cd1 Update production.md 2017-10-18 19:14:06 -07:00
Wang Jie 69213328a1 Update samples-for-compose.md 2017-10-18 19:14:06 -07:00
Wang Jie 778d436c41 Update startup-order.md 2017-10-18 19:14:06 -07:00
Wang Jie 4089b1b1d7 Update link-env-deprecated.md 2017-10-18 19:14:06 -07:00
Wang Jie 5a06815e6b Update environment-variables.md 2017-10-18 19:14:06 -07:00
Wang Jie fb163a2288 Update env-file.md 2017-10-18 19:14:06 -07:00
Wang Jie 42b84f59a3 Update bundles.md 2017-10-18 19:14:06 -07:00
Misty Stanley-Jones d8adc37e74 Revert "Document new features in Compose 1.17 (#5019) (#5021)" (#5038)
This reverts commit 52fe0df34b.
2017-10-18 16:07:20 -07:00
Misty Stanley-Jones 52fe0df34b Document new features in Compose 1.17 (#5019) (#5021)
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-17 21:17:28 -07:00
Wang Jie bcafc55f26 Update completion.md (#5000) 2017-10-17 17:41:23 -07:00
Wang Jie 0a96073f07 Update envvars.md (#4999) 2017-10-17 17:40:46 -07:00
John Mulhausen 6e2f94daf6 Revert "improve links from v2.1 (#4991)" (#5015)
This reverts commit 62b05a1040.
2017-10-17 15:13:56 -07:00
Godefroid Chapelle 62b05a1040 improve links from v2.1 (#4991)
- fix link_local_ips and pids_limit
- more specific links to volume and network labels, volume name
2017-10-17 13:27:10 -07:00
Wang Jie 1fae282146 Update build.md (#4986) 2017-10-16 16:59:31 -07:00
Wang Jie ca4b8b90e6 Update gettingstarted.md (#4985) 2017-10-16 16:58:58 -07:00
Wang Jie 317ebe11e1 Update install.md (#4984) 2017-10-16 16:57:32 -07:00
Wang Jie 18b3cfb955 Update overview.md (#4981) 2017-10-16 16:54:58 -07:00
locofocos 955d8b37f4 Update "docker-compose up" doc to explain logging (#4672)
After running "docker-compose up", the console shows a nice aggregated output of each container. When running this in detached mode, it's not clear how to later view this aggregated output again. Added a quick note on how this is done.
2017-10-16 16:09:52 -07:00
Misty Stanley-Jones 06c3b7cd34 Add docs for attachable key in composefile (#4957) 2017-10-13 16:00:56 -07:00
Misty Stanley-Jones 26ab6617b4 Backport note about links being legacy (#4956) 2017-10-13 16:00:26 -07:00
Misty Stanley-Jones 990a5be262 Cross-linking between compose and configs/secrets (#4869) 2017-10-10 11:08:51 -07:00
Achilleas Pipinellis 59ca09a210 Make the link in wordpress.md point to the right engine doc (#4838)
Although there's a redirect, it's better to link to to the
right place.
2017-10-09 17:02:23 -07:00
Gilad Peleg 25ed66a2c5 Make sure code example is correctly presented (#4839) 2017-10-09 17:01:57 -07:00
Misty Stanley-Jones b02cca86cf Standardize on site-wide variables for Docker and component versions (#4792) 2017-10-05 16:36:03 -07:00
Misty Stanley-Jones 0201df7716 Clarify that enable_ipv6 requires v2 Compose file (#4811) 2017-10-05 12:15:03 -07:00
Victoria Bialas 6db50d4591 clarified Compose resource options for v2, v3 (#4712)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-09-25 13:37:09 -07:00
Sébastien HOUZÉ 0c9ad498f9 Add tmpfs as mount type (#4704)
tmpfs was missing in the mount types of volumes long syntax.
2017-09-25 11:30:50 -07:00
Santiago Petrone 4204df859d Indentation fix (#4491) 2017-09-19 11:09:53 -07:00
rdxmb 207acedee2 healthcheck examples - considers valid exit codes (#4652)
As the exit codes for healthcheck must be 0 or 1 , these examples take care about that.
(curl could also exit with another code != 1)
2017-09-19 10:26:53 -07:00
Victoria Bialas 02fc66fde8 More info on resource constraints in Compose v3 and v2 (#4651)
* added more info about resource constraints to Compose docs

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* fixed link in Compose docs, added instructions in test for adding custom target link link IDs

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* fixed links

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-09-18 16:02:05 -07:00
Gwendolynne Barr 34cd249844 Improvements to Getting Started content for Compose (#4617) 2017-09-13 16:55:51 -07:00
Gwendolynne Barr ba9086c0a4 Clarify that Compose works in production (#4612) 2017-09-13 16:51:34 -07:00
Gwendolynne Barr 1d20f44618 Indent services in compose file (#4611) 2017-09-13 13:27:59 -07:00
Harald Albers 244ff5f43a Update Docker Compose version to 1.16.1 (#4502)
Signed-off-by: Harald Albers <github@albersweb.de>
2017-09-11 16:41:42 -07:00
Juan Pablo Picasso d92a15dbc9 fixed link to dns section (#4448) 2017-09-11 09:54:43 -07:00
Joffrey F 0b22c35a28 Remove delayed features from 1.16.0, fixed changelog (#4417) 2017-08-31 15:52:18 -07:00
Joffrey F 0702f23aae Document Compose 1.16.0 additions (#4293)
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-31 15:52:18 -07:00
Yong Wen Chua 563c564d4c Document Docker Compose Version 2.3 (#3994)
And the new "target" parameter under "build"

Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
2017-08-31 15:52:18 -07:00
Wenxuan Zhao 4d43ae7ea2 Fix `depends_on` links across documents. (#4424)
NOTE: compose file v1 doesn't support `depends_on`,
      thus it's still a broken link.

Signed-off-by: Wenxuan Zhao <viz@linux.com>
2017-08-29 15:52:02 -07:00
Harald Albers 0688b894ca Fix section hierarchy in Compose's completion page (#4421)
Signed-off-by: Harald Albers <github@albersweb.de>
2017-08-29 15:51:23 -07:00
Harald Albers 6861d77db3 Fix download url for Compose's command completion (#4420)
* Fix download urls for compose command completion

Signed-off-by: Harald Albers <github@albersweb.de>

* Use sudo when installing bash completion

Writing to the system-wide completion plugin directory `/etc/bash_completion.d/`
requires root permissions.

Signed-off-by: Harald Albers <github@albersweb.de>
2017-08-29 11:08:43 -07:00
Victoria Bialas 7e0033575a clarified links and services communication in Compose (#4416)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-08-29 10:16:47 -07:00
Daniel Nephin a932d8de73 Fix some links that pointed at the wrong repo (#4371)
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-08-28 16:56:44 -07:00
Seth 503299c466 Fix docs when installing on Compose on Ubuntu. (#4399) 2017-08-28 11:24:03 -07:00
Victoria Bialas cda80e0859 updates to version variables for compose and machine (#4348)
* updates to version variables for compose and machine

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* copyedit to make Compose release version number correct

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-08-23 17:01:11 -07:00
Victoria Bialas 0f802e1b76 Update Compose quick-start to show static loaded image, then volume mount (#4255)
* re-org sample to show static loaded image, then using a volume mounte

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* review comments from mstanleyjones and joaofnfernandes

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added a sub-step to make the workflow and output make sense

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* combined notes about shared drives and volumes, reorganized topic order

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-08-18 12:09:24 -07:00
Andriy Maletsky 4b85167975 compose - fix permissions issue for curl (#4248) 2017-08-17 15:00:52 -07:00
Alon Bar Tzlil c5e28b8412 Fix file version in volumes long syntax example to 3.2 (#4202)
Fix docker-compose file version in the example given for the new volumes "long syntax", available from version 3.2.
Currently the example contains version 3 which does not support this syntax.
2017-08-17 14:43:03 -07:00
Brikou CARRE b812b9d775 Fix rendering of YAML snippet (#4185) 2017-08-17 14:14:52 -07:00
Joffrey F 45ac9fe357 Add clarification on env_file / environment interaction (#4177)
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-17 14:09:43 -07:00
Victoria Bialas 935a40e2b1 Re-organized Compose install docs into tabs (#4213)
* re-organized Compose install docs into tabs

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* combined d4win and windows server on one tab

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* fixed tabs alignment

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* fixed heading levels to show properly in TOC

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* fixing tabs and content

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* removed cruft test content from tabs

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* final version of tabs

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* Set toc_max to get headings within tabs out of on-page toc

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added a subtle <hr> under tab topics per review request

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-08-16 17:37:17 -07:00
Victoria Bialas 6660c8ef69 put back missing Compose Wordpress example (#4228)
* put back missing Compose Wordpress example

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* addressed review comments, postponing one comment re: yaml code fencing

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-08-16 17:07:28 -07:00
Sebastiaan van Stijn 4c41debee6 Fix credential-spec documentation (#4179)
The values that are provided in the docker-compose file
should be relative, not absolute.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-08-15 10:43:00 -07:00
John Mulhausen c7bc5c3d0e Fixes #4149 2017-08-14 13:34:47 -07:00
Sebastiaan van Stijn 587248348c Remove warning for limitation in Docker 1.13.1 (#4180)
Docker 1.13.1 is EOL, and no longer supported, so
this warning is a bit redundant now.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-08-14 11:26:52 -07:00
cthomas15 fad97596eb Changes to compose/compose-file/index.md (#4172)
Added 'rollback' to the list in the following bullet:
- `failure_action`: What to do if an update fails. One of `continue`, `rollback`, or `pause` (default: `pause`).
2017-08-11 16:20:22 -07:00
Keisuke Izumiya f4c41f2b2e Fix version number (#4134) 2017-08-10 16:12:17 -07:00
James Guthrie e09f7063cb Remove superfluous sentence from compose-file docs (#4154) 2017-08-10 15:52:16 -07:00
Victoria Bialas 65fdf795f4 Fix Compose file samples for volumes and other (#4142)
* Fix Compose file samples for volumes and other

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* fixing Compose file example, adding another volume mount example

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* replaced x-ref to volumes info with the right one

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* add bullets to note

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* corrected for description of bind mount as example intro

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* modified volumes example per developer review

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* corrected for legacy stuff on examples, clarified named volumes

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* fixed capitalization in x-refs visible text

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-08-10 14:49:55 -07:00
Victoria Bialas 85d70ff7d8 clarify Compose install prerequisites (#4130)
* clarify Compose install prerequisites

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* organized install on Microsoft Server into steps

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* better highlighting and organization for the desktop systems section

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* copyedit for consistency

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* changed Docker server --> Docker per review

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* attempt to clarify Compose / Docker Engine dependencies per reviews

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* copyedits per reviews

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-08-09 13:18:22 -07:00
Joffrey F d03920a6e8 Rewrite exit codes paragraph (#4100)
Improved accuracy and fixed grammar

Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-08 14:15:50 -07:00
Victoria Bialas 4be0abd93b surface Compose file example at top of topic (#4090)
* surface Compose file example at top of topic

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* removed extraneous intro

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-08-03 21:22:47 -07:00
Victoria Bialas 6dd38de6c8 Added better links to Compose overview docs (#4074)
* added better links to Compose overview docs

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* fixed drupal samples link per feedback

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-08-02 09:59:12 -07:00
ryota-murakami 24d6f9b1f7 fix typo (#4031) 2017-08-01 12:16:34 -07:00
Victoria Bialas a922be3d0f Update admonitions CSS for consistency and better writer workflow (#4019) 2017-07-31 21:49:56 -07:00
Victoria Bialas a4b4acc92c Fix links to subtopics in index.md files by include full path (#4054)
* for all links to , changed to full path

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* fixed link in Swarm Tutorial per review comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-07-31 18:54:08 -07:00
Victoria Bialas eb25815fb9 Better examples to show Compose file structure, expand/collapse accordion (#3967)
* better examples to show Compose file structure

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* cleaned up leading spaces in Compose file example

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* cleaned up leading spaces, added a test file

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* expand/collapse accordion full implementation, explanation in test.md

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* delete temporary test file from PR

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* fix accordion to work on mobile (cursor style)

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* verified fix for mobile worked, added same to test.md, updated notes and content

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* Clarifed details on test page, fixed references for FontAwesome icons

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-07-28 12:32:53 -07:00
Victoria Bialas 52644895c0 added suggested new example to the include
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-07-27 11:09:03 -07:00
dark0dave a97df05f5b Update compose-file-v2.md 2017-07-27 11:09:03 -07:00
dark0dave be2dcf2909 Update compose-file-v2.md
Missing Documentation
2017-07-27 11:09:03 -07:00
Joffrey F 181a0c6346 Compose 1.15.0 additions (#3950)
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-26 16:08:44 -07:00
tahia d0f6397a9e Specify Compose version for Compose file formats (#3297)
* Specify Compose version for Compose file formats

Explicitly specifying Compose versions file formats 2.1 and 2.2.

* corrected typo 2.1 --> 2.2

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-07-26 16:08:44 -07:00
Victoria Bialas 3558712894 added endpoint_mode topic for Compose file v3.3 (#3982)
* added endpoint_mode topic for Compose file v3.3

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* incorporated review comments re: features and versioning

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-07-26 10:33:46 -07:00
Victoria Bialas 1c6ff26042 added Compose topics on caching options for performance (#3932)
* added Compose topics on caching options for performance

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* updated title for Compose topic

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* line wrap per review

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-07-21 15:52:41 -04:00
Jacek Szubert c070ffe880 Remove documentation about the `--ignore-override` option (#3865)
* Remove documentation about the `--ignore-override` option

* changed link to full path, copyedit

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-07-12 13:14:50 -07:00
Misty Stanley-Jones 0c7d3b5f4c Deprecate some Dockerize topics in favor of library ones (#3735) 2017-07-12 12:06:07 -07:00
Adrian Moisey 39dd81ec91 Fix example of "configs" (#3807)
This should be "configs" not "secrets" as it's an example of the new "configs" option.
2017-07-05 16:45:55 -07:00
Victoria Bialas c2bd959d1f env file list precedence Compose file (additional clarification) (#3822)
* clarified ordering of env files

* added env_file order of precedence to v1, v2 Compose

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* formatting

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-07-05 13:43:42 -07:00
Victoria Bialas d2b71ad555 clarified Mac vs. Linux steps on bash completion (#3800)
* clarified Mac vs. Linux steps on bash completion

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* copyedit on Compose file reference page

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-07-03 16:26:54 -07:00
Misty Stanley-Jones 22e10b99f1 Fix Docker EE Windows links (#3789) 2017-07-03 12:15:28 -07:00
Victoria Bialas 88bb7acbd5 expanded on explanation in note re: extends supported versions (#3696)
* expanded on explanation in note re: extends supported versions

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* copyedits

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* x-ref to open issue to bring back extends

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added more x-refs to note on extends

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-29 11:57:03 -07:00
Misty Stanley-Jones 17e1da077b Tighten up base image and parent image terminology (#3720) 2017-06-28 11:56:41 -07:00
Misty Stanley-Jones 08f830811d Add configs to compose file reference 2017-06-28 08:31:29 -07:00
Misty Stanley-Jones b1aa298c16 Docs for Compose 1.14 (#3697)
* Specify Compose version for Compose file formats (#3297)

* Specify Compose version for Compose file formats

Explicitly specifying Compose versions file formats 2.1 and 2.2.

* corrected typo 2.1 --> 2.2

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* Document new Compose 1.14.0 features (#3695)

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

* Current compose is 1.14.0 (#3690)

Signed-off-by: Guillaume Rose <guillaume.rose@docker.com>

* Fix typo
2017-06-23 18:15:01 -07:00
Jon-Michael Deldin 8cd94d3873 Fix test DB creation in Compose's database.yml (#3123)
Without the host and credentials, the `myapp_test` database is not
created, and instead, the user receives a PG error and a long backtrace.
This commit moves the credentials to a default anchor to share across
development and test environments.
2017-06-20 13:55:06 -07:00
mtilson f0a851beb1 Update completion.md (#3652) 2017-06-20 13:49:22 -07:00
Sequoia McDowell 744e5eeec8 Fixing documentation for v2 `links` (#3641)
wrapping array values in quotes is required.
2017-06-20 11:12:57 -07:00
Victoria Bialas d1ff1576cb Machine bash completion (#3624)
* corrected command completion URLs compose, machine plus cloud updates

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added notes re: Cloud on Machine cloud topics

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added notes and links re: legacy Machine swarm v. swarm mode

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* copyedit, used better punctuation

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-15 16:38:27 -07:00
Lucile df8c9c3e76 Add bash information about return codes. (#3547)
* Add bash information about return codes.

* Update shell return values after shin-'s comment
2017-06-14 09:55:59 -07:00
Franz Josef Kaiser f02c1003c2 Explain precedence of environment variables (#3496) 2017-06-13 11:50:48 -07:00
Emiliano 'AlberT' Gabrielli cd3bd1dccd Clarify on quotation marks (#3503)
Spent a lot trying to issue why Mysql password was not set in the container .. it was caused by having quoted it!
2017-06-13 11:49:41 -07:00
Victoria Bialas 5522090c0f surfaced -f, -p options on docker-compose (#3586)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-13 10:49:55 -07:00
Victoria Bialas aee7e98fcb fixed links to topics w/underscores (#3583)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-12 19:35:08 -07:00
Joffrey F b60dd6facb Remove unsupported link_local_ips param from v3 doc (#3506)
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-12 18:59:53 -07:00
Victoria Bialas 2cfb7ba743 added links to Compose release versions, improved matrix description (#3580)
* added links to Compose release versions, improved matrix description

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* review comments, used include for matrix in all file references

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* incorporated review comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-12 18:40:51 -07:00
Victoria Bialas fa52e73dc5 Added notes and troubleshooting topic on volume mounts from host (#3556)
* added notes and troubleshooting topic on volume mounts from host

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* updates to troubleshooting, FAQs and shared drives topics and notes

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-12 15:10:15 -07:00
Misty Stanley-Jones a173c4630d Document OOME information (#3536) 2017-06-09 09:41:00 -07:00
Victoria Bialas 12f96be8d8 added note on external volumes with docker stack deploy (#3541)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-08 17:35:02 -07:00
Victoria Bialas 63c7febfdd added Python, Docker Cloud install/run to known issues and setup notes (#3525)
* added Anaconda Python 3.5.2 install/run to known issues

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added notes re: Python 3.x not supported in setup and install

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* fixed heading levels in Cloud known errors

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* fixed links (moby --> docker), formatting

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* fixed on-page link list alignments for toc max/min topics

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-07 18:36:50 -07:00
Victoria Bialas bb8146180f Compose improvements, env_file vars, rails sample (#3517)
* added example for env_file variables

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* copyedits and rework of Compose rails example

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-07 14:05:34 -07:00
Victoria Bialas c239914df6 Compose CLI reference copyedits (#3499)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-05 17:35:44 -07:00
Victoria Bialas da9734a626 updated syntax for command in Compose files (#3498)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-05 16:37:54 -07:00
Joffrey F 000cb2ebc3 Add pids_limit to upgrade docs (#3366) 2017-06-02 11:51:38 -07:00
Ghislain Bourgeois 2a87df763d Specify tagging behaviour when running docker-compose build command. (#3428)
* Specify tagging behaviour when running docker-compose build command.

* Link image to compose-file reference.
2017-06-02 10:23:34 -07:00
Kasidesh Yontaradidthaworn 40db188f3f Update rails.md (#3421)
syntax error at Gemfile while compose run web rails new .
2017-06-02 09:54:40 -07:00
Victoria Bialas ffc99ea6e1 updated/improved Compose samples (#3438)
* updated/improved Compose samples

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* linked some more basic docker-compose commands

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* coypedit

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-30 17:15:42 -07:00
Victoria Bialas 9a74081df7 add note re: ports for multi-site Wordpress (#3398)
* add note re: ports for multi-site Wordpress

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* incorporated review comments from Misty

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* copyedit

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-30 13:20:33 -07:00
Victoria Bialas 5a610f6367 Compose examples (#3346)
* improve Compose rails sample

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* updated file list and commands based on feedback for no skip-bundle

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added, start, stop, rebuild info to Rails sample

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* updated info re: default Flask port for compose get started

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* more changes for rebuilding steps

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added rebuild info

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added info about Gemfile.lock to rebuild steps

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-23 23:26:57 -07:00
Harald Albers e9ad2f76eb Add docker-compose exec -u to reference page (#3349)
Signed-off-by: Harald Albers <github@albersweb.de>
2017-05-23 16:33:47 -07:00
zasca 87d08620aa Added unless-stopped restart policy (#3278) 2017-05-22 10:39:29 -07:00
Sergei Maximov e339059c43 Fix whitespace issues for compose/startup-order.md (#3284)
Signed-off-by: Sergei Maximov <s.maximov@teachmeplease.com>
2017-05-19 15:35:07 -07:00
Михаил a96de9f0f1 overview.md updated: typo fix (#3281) 2017-05-19 15:33:51 -07:00
Victoria Bialas b62449b3c8 clarified logging options in Compose, fixed glaring note formats (#3272)
* clarified logging options in Compose, fixed glaring note formats

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added link directly to JSON driver in supported drivers docs

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* took off code tags to make link stand out

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* fixed alignment of note text in markdown

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* x-ref to how to set environment variables in containers

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* copyedit in note

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-16 12:02:54 -07:00
Victoria Bialas 8a9ffb234d fixed code example in Compose startup order per feedback (#3275)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-15 15:35:50 -07:00
Victoria Bialas 7c60f48705 updated notes in Compose install to map to new icon styles (#3259)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-13 22:23:50 -07:00
Ben Reichert 07a105d724 Add max-size, max-file logging options documentation (#3243) 2017-05-13 22:14:01 -07:00
Victoria Bialas 4dfebb9118 update Compose release link, clarified download pattern (#3225)
* update Compose release link, clarified download pattern

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added more version admonitions for Linux and containers, improved notes

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added site-wide variable for Compose version, review comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-12 14:58:57 -07:00
Kevin Burnett 97582854b5 dotnet build fails without sql server dependency (#3215)
* dotnet build fails without sql server dependency

this makes the docs work for me
2017-05-10 11:58:10 -07:00
John Yani d0e12df054 Service create vs run (#3217)
This compose section should reference docker service create, not docker run options
https://github.com/moby/moby/issues/32844
2017-05-10 11:52:30 -07:00
Danny Tracey c4da71c5fa docs change for compose/networking (#3094)
* docs change for compose/networking

Without this clarification, I was tripped up for a while because it wasn't easy to understand why containers were getting connection refused errors on ports defined for the host, not the container.
2017-05-10 11:26:29 -07:00
Victoria Bialas 1683168500 improved Compose samples overview page (#3212)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-09 16:35:16 -07:00
Victoria Bialas 105333e079 clarified use of volumes with stack files, services, swarms (#3201)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-08 18:50:45 -07:00
Victoria Bialas 7050d9060d expanded on pull command, added links to Compose samples (#3197)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-08 16:38:58 -07:00
Joffrey F 84c8ff4e63 Update scale docs
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-06 11:03:01 -07:00
Joffrey F 33b1c443a9 Add docs for IPAM options
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-06 11:03:01 -07:00
Joffrey F f6c5c41e2d Add v2.2 format description to versioning index
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-06 11:03:01 -07:00
Joffrey F 9f26b57158 Fix broken links to compose versioning docs and remove some obsolete notes
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-06 11:03:01 -07:00
Joffrey F da867b5620 Add docs for new `init` option in service config
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-06 11:03:01 -07:00
Vlad 1b7091501a Fix indentation (#3180) 2017-05-05 21:48:18 +00:00
Marko Klemetti 1efadb8a88 Add sh/alpine -compliant wait-for to options. (#3157) 2017-05-04 21:28:58 +00:00
Victoria Bialas 71b91bd468 add detail on redis default port
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-05-01 15:56:50 -07:00
Andy Neff 3de6ebc21e Update docker-compose index.md (#3090)
There were a number of things wrong with the `restart` definition

1. The volumes note came after the restart section rather than before
2. The restart command used array notation rather than map. This is confusing to those unfamiliar with yaml and inconsistent with the rest of the documentation
3. Using `docker-compose` myself, saying `restart: no` does not work, but `restart: "no"` does. 

```
ERROR: The Compose file './docker-compose.override.yml' is invalid because:
services.letsencrypt.restart contains an invalid type, it should be a string
```
2017-04-28 22:07:50 +00:00
hacfi 3e137458e8 Fix yml indention (#3089) 2017-04-28 22:06:04 +00:00
John Yani b07f615784 Wrong order of docker compose restart section (#3093) 2017-04-28 14:46:11 -07:00
Xianlu Bird 903df7ebfc Fix published&target description in ports section (#3016) 2017-04-26 20:52:14 +00:00
Daniel Maslowski 50e9e49552 Note on mixing network_mode with links in Docker compose file (#3049) 2017-04-26 20:50:47 +00:00
John Mulhausen f2cb46bf05 Fixes #3076 2017-04-26 13:33:54 -07:00
Lenny Linux 9a1f99cd11 add warning class and a linebreake to the warning blogquote (#2937)
* Update fedora.md

add warning class to blogquote

* Update linux-postinstall.md

add warning class to blogquote

* Update ubuntu.md

add warning class to blogquote

* Update https.md

add warning class to blogquote

* Update swarm_manager_locking.md

add warning class to blogquote

* Update dockerlinks.md

add warning class to blogquote

* Update deploying.md

add warning class to blogquote

* Update deploying.md

add warning class to blogquote

* Update insecure.md

add warning class to blogquote

* Update discovery.md

add warning class to blogquote

* Update dockerd.yaml

add warning class to blogquote

* Update docker_secret_rm.yaml

add warning class to blogquote

* Update docker_service_rm.yaml

add warning class to blogquote

* Update docker_secret_rm.yaml

add warning class to blogquote

* Update scale-your-cluster.md

add warning class to blogquote

* Update resource_constraints.md

add warning class to blogquote

* Update binaries.md

add warning class to blogquote

* Update content_trust.md

add warning class to blogquote

* Update secrets.md

add warning class to blogquote

* Update index.md

add warning class to blogquote

* Update install-sandbox-2.md

add warning class to blogquote

* Update docker-toolbox.md

add warning class to blogquote

* Update index.md

add warning class to blogquote

* Update centos.md

add warning class to blogquote

* Update debian.md

add warning class to blogquote

* Update faqs.md

add linebreak after Looking for popular FAQs on Docker for Windows?

* Update install.md

add linebreake after **Already have Docker for Windows?**

* Revert "Update dockerd.yaml"

This reverts commit 3a98eb86f700ade8941483546c33f69a9dab8ac3.

* Revert "Update docker_secret_rm.yaml"

This reverts commit 5dc1e75f37033932486c11287052b7d64bf83e55.

* Revert "Update docker_service_rm.yaml"

This reverts commit a983380a5625b471f1a03f8ed2301ead72f98f1b.

* Revert "Update docker_secret_rm.yaml"

This reverts commit 4c454b883c300e26fbb056b954bb49ec2933b172.
2017-04-25 11:33:27 -07:00
Victoria Bialas 5c2b6663c4 Windows server 2016 Compose install, Compose file format updates (#3035)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-04-25 10:44:34 -07:00
Victoria Bialas df4892c964 update re:container_name not supported in v3 Compose (#3003)
* update re:container_name not supported in v3 Compose

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added container_name to list of removed v3 options

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* corrected  definitions per reviews

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* listed unsupported suboptions for deploy key

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-04-24 11:47:18 -07:00
Jonas B. Nielsen 82cf41f6f5 Links to compose file information terminates with 404 (#3011)
I have corrected the link in two places to what I expect to be the right resource.
2017-04-24 09:22:36 -07:00
John Harris f179037853 Clarify Swarm vs swarm mode with compose capabilities (#3008) 2017-04-23 11:44:11 -05:00
Germán Larraín 958fb121b0 django.md: fix Python image version (#2991)
Dockerfile's base image was not consistent the the explanation below.
2017-04-21 23:59:02 -07:00
Krassimir Valev a6ee7cfefe Fixed networks identation issues (#2989) 2017-04-21 23:58:05 -07:00
Julien Maitrehenry 3edabae435 Fix manager and worker join tokens
* Fix manager and worker join tokens. Issue #2088.

Fix screenshots per issue #2126

Move vote images to correct dir

Fix rendering issue with inline code snippet #1990

Fix for stack yaml reference (#1476)

Fix image link

Add shutdown procedures for #1017

* Make the fix asked in the PR

Little fix
2017-04-21 14:05:12 -05:00
Suraj Narwade 28fdfd3b28 added `$` in commands (#2926)
resolves #2925
2017-04-21 11:17:39 -05:00
Bill a3a7ae1e0b replaced docker/docker with moby/moby (#2879)
* replaced docker/docker with moby/moby

* fixed incorrect name changes in release notes

* fixed mentions of moby/moby in code
2017-04-20 15:32:18 -05:00
Suraj Narwade 553db19401 Explains order of precedence between env-file and env (#2903)
Resolves #1312
2017-04-20 15:29:00 -05:00
Suraj Narwade e7c16b5fdc separate out the links (#2935)
* separate out the links

resolves #2934

* Update gettingstarted.md
2017-04-20 15:00:32 -05:00
Cory Locklear fb33155fc7 Fixes #1097. Add alert for potential edit of settings.py for ALLOWED_HOSTS for Windows 10 (#2886) 2017-04-20 12:07:58 -05:00
Jarrod Pooler 9c4f7e09af Update bash completion steps and add MacPorts steps (#2910) 2017-04-20 11:44:20 -05:00
Victoria Bialas b07dc066dc copyedits, reformat commands, updates for versions (#2942)
updated bash script wrapper commands

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-04-20 01:17:08 -05:00
Suraj Narwade 09eee26ef3 fixes command execution ambiguity in compose/install.md (#2905)
* fixes command execution ambiguity in compose/install.md

Resolves #1678

* copyedit to kick build
2017-04-20 00:15:19 -05:00
Suraj Narwade be37ddd557 Adding documentation for restart policy (#2912)
Resolves #1353
2017-04-19 17:05:02 -05:00
Shubheksha Jalan 2ec7b0d591 Remove deprecated --all option for `docker-compose rm` (#2821)
* remove --all from docker-compose rm
2017-04-19 14:49:25 -05:00
Suraj Narwade db6a60b806 Fixed django example (#2914)
Resolves #2468
2017-04-19 14:18:05 -05:00
Shubheksha Jalan d1308508e0 Make install instructions for Docker Compose clearer (#2814)
* clarify install instructions

* add direct install instructions for Ubuntu

* remove apt-get install instructions

* Edits
2017-04-19 07:03:20 -05:00
Rubab-Syed bdcd3be43c Add note that compose v3 doesnt support additional ipam configs (#2858)
* Add note that compose v3 doesnt support additional ipam configs (#1528)

* Fix minor tick (#1528)

* Edits
2017-04-19 07:00:23 -05:00
Shubheksha Jalan 7245c83c17 Add the --fail to `curl` commands when installing compose (#2817)
* Add the fail option to curl commands when installing compose

* move --fail to the beginning of the command for readability
2017-04-18 17:39:37 -05:00