docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
47,634 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

1245 Commits

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