Vlad Dm
0d21824e3c
update compose django example
2018-05-19 16:07:15 +03:00
Xander Marjoram
87c84916f3
Documentation typo fixes
2018-05-18 10:06:05 -07:00
Anthony Rosequist
5b149572f7
Replace 'less' with 'fewer'
2018-05-14 15:05:40 -07:00
Vin Yu
26499eb90a
Updating the minimum memory step 4GB->2GB
...
SQL Server can now run on a minimum of 2GB now
https://docs.microsoft.com/en-us/sql/linux/sql-server-linux-setup?view=sql-server-linux-2017#system
2018-05-14 15:04:07 -07:00
CrimsonGlory
e4eb29caa1
Update scale.md
...
Added a link to the old issue:
https://github.com/docker/compose/issues/5251
2018-05-03 16:58:36 -07:00
Trapier Marshall
2a62bcf235
fix version in compose placement pref example ( #6569 )
2018-04-27 09:22:24 -07:00
Teoh Han Hui
37f9546e32
Quote port numbers when using short syntax
...
Comply with our own advice.
2018-04-23 10:39:45 -07:00
Ryoichi Obara
3bb62ef910
Update wordpress.md
...
- Fix/Change volume name ``dbdata`` to ``db_data`` (Fit with ``db_data`` in Notes section.)
2018-04-18 16:05:25 -07:00
James Gentes
a8b93a59ea
Added note to 'ports' section: Port mapping is incompatible with `network_mode: host`
...
Took a while to figure this one out. Source: https://github.com/docker/compose/issues/4799#issuecomment-299605031
2018-04-16 13:57:53 -07:00
rdxmb
246e8e2e3a
DO-NOT-MERGE update the docs for using host-network ( #6124 )
2018-04-11 13:09:49 -07:00
Joffrey F
d4e7eee27e
Fix merge artifacts in vnext branch
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-11 10:45:28 -07:00
Joffrey F
8348f4ffb2
Document new Compose file additions
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-11 10:45:28 -07:00
Joffrey F
636c626e49
New Compose CLI options
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-11 10:45:28 -07:00
Joffrey F
aca2e9ce5f
Document compatibility mode
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-11 10:45:28 -07:00
Joffrey F
1c58771f85
Use updated notes format
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-11 10:45:28 -07:00
Joffrey F
66a461ecf5
Document compatibility mode
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-11 10:45:28 -07:00
Robert Kielty
56ec08b1a6
Two minor grammar fixes, one clarification ( #6406 )
2018-04-09 19:10:33 -07:00
Joffrey F
0e2cc91765
Add cache_from to v2 reference ( #6410 )
2018-04-09 18:56:59 -07:00
Gionni
4f09550bed
backtick deprecated. updated. ( #6396 )
2018-04-07 12:17:34 -07:00
Kevin Miller
593d89d4d3
Fixed `-OutFile` argument to be the correct path
...
`$Env:ProgramFiles\Docker\Docker\resources\bin\docker-compose.exe`
2018-04-06 08:59:18 -05:00
Benjamin White
e5e8051b59
Fix events JSON blob format ( #6195 )
...
* Update example events JSON blob
The example JSON blob given doesn't match up with the values I experience when running `docker-compose events` myself, so I'm updating the documentation to save someone else some time.
* Add link to event types for convenience
2018-03-27 11:17:37 -07:00
Kanan Rahimov
e01ab90c07
Add using of PGPASSWORD for psql
...
Given example is not complete at least for official postgres image. I have added setting of psql password over POSTGRES_PASSWORD env variable.
2018-03-27 10:28:32 -07:00
Christian Kniep
5de485dbe9
Update password to comply with password rules
...
The password needs an upper-case and a number to comply. Like that it fails and for a beginner it might not be obvious why - even thought it will print an error; but it's just one line.
2018-03-27 09:59:43 -07:00
Joffrey F
12757bf953
Compose 1.20.0 ( #6266 )
2018-03-20 11:23:36 -07:00
Gwendolynne Barr
c39ddd656a
Repair arg example to match v2 ( #6253 )
2018-03-17 22:00:02 -07:00
Björn
9ba5248f1e
Fix #5219 : Change unsafe ARG example in compose file docs. ( #5984 )
2018-03-17 11:22:19 -07:00
Jeffrey M. Levesque
541e60ec16
#6215 : compose-file-v2.md, fix 'version: 3.2' typo
2018-03-13 10:50:51 -07:00
Dave James Miller
3035ad0971
Fix capitalisation of WordPress in 3 places
2018-03-12 14:19:41 -07:00
Rajin Gill
04cf355bb8
Typo
2018-03-12 14:18:23 -07:00
Joao Fernandes
f3804e6012
Clarify order for overriding env vars
2018-03-09 13:23:31 -08:00
Joao Fernandes
d670e54ac3
Update compose env to comply with styleguide
2018-03-09 13:23:31 -08:00
Ivan V
4836139458
Grammar fix
...
Grammar fix
2018-03-08 16:50:58 -08:00
Marcus Geißler
11c1b1c65f
Use Compose stop instead of down
2018-03-05 09:49:49 +01:00
Marcus Geißler
67f6404740
Add information on stop order
...
Documentation should also mention that compose takes dependency order into account for shutdown as well.
docker/compose#2679
2018-03-03 15:46:59 +01:00
Marcus Geißler
a8be2c7c37
Add information on shutdown-support
...
Documentation should also mention that compose takes dependency order into account for shutdown as well.
https://github.com/docker/compose/pull/2679
2018-03-03 15:40:09 +01:00
Norman Kämper-Leymann
4c36f67964
Update rails.md
...
Avoid running `docker-compose run web rake db:create` every time you restart/rebuild the app.
2018-03-02 11:11:08 -08:00
Seth Reid
3a2e0c8e18
Added required line to update TLS version
...
Github now only supports TLS1.2 and you need to run the following command to make sure these instructions work. Please let me know if my phrasing is not good and I can update to make it work
2018-03-02 10:58:44 -08:00
Joffrey F
1ba03f1a34
Add build target to v3 reference ( #6107 )
2018-02-27 16:11:01 -08:00
Diego Rabatone Oliveira
2f0e2b684a
Fix grammar error on compose-file index.md ( #6070 )
2018-02-25 09:03:19 -08:00
BANO.notIT
eb8f177865
Fix docker compose to docker-compose ( #6033 )
2018-02-20 10:00:15 -08:00
Patrick Chanezon
1e88fbd088
update wordpress compose file ( #6029 )
2018-02-16 14:49:42 -08:00
Misty Stanley-Jones
d14a9f96fd
Doc that for 2.1+, overlay networks are attachable ( #5967 )
2018-02-08 15:58:45 -08:00
Joffrey F
2d12fdf671
Add docs for Compose file v3.5 and v3.6 ( #5912 )
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-08 13:54:12 -08:00
Steven Showers
b7a9862728
Clarified max_attempts behavior ( #5949 )
2018-02-07 16:09:51 -08:00
Joffrey F
761d421b5c
Fix typos ( #5944 )
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-07 13:18:54 -08:00
Joffrey F
c399e1e479
Docs for Compose 1.19.0 release ( #5826 )
...
* Docs for Compose 1.19.0 release
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-07 13:18:54 -08:00
ethan-haynes
074268b8ca
added doc changes for upcoming tmpfs-mode 3.6 compose ( #5777 )
...
Signed-off-by: Ethan Haynes <ethanhaynes@alumni.harvard.edu>
2018-02-07 13:18:54 -08:00
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
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