Commit Graph

1306 Commits

Author SHA1 Message Date
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
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
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 - `&#8212;` 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