Wadim Kruse
b36b6d2c86
Fix restart policy description ( #5927 )
2018-02-06 09:02:36 -08:00
schalkwijk
589a83a38a
Use correct HTML character reference for em dash ( #5917 )
...
Minor typo in the docs - `—` should be used for an [em dash](https://en.wikipedia.org/wiki/Dash#Common_dashes ), not `&8212;`.
2018-02-05 09:35:49 -08:00
Misty Stanley-Jones
a17a47dd77
Favor docker <object> <verb> format of commands ( #5914 )
...
Remove instances of:
- docker rmi
- docker images
- docker stop
- docker rm
- docker create
- docker exec
- docker attach
2018-02-05 09:33:47 -08:00
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