Commit Graph

1313 Commits

Author SHA1 Message Date
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