docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
55,337 Commits 13 Branches 28 Tags 824 MiB
Commit Graph

1603 Commits

Author SHA1 Message Date
Sebastiaan van Stijn 38423908d4
Add highlighting to compose-file reference 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-03-19 12:14:44 +01:00
Maria Bermudez 755ac92c05
Merge pull request #8246 from frank-dspeed/patch-1 
Update index.md
 2019-03-18 12:02:08 -07:00
Maria Bermudez 4d463d7c97
Link to FROM and ARG interaction section 2019-03-18 12:01:28 -07:00
Maria Bermudez 773ff41ddd
Link to ARG and FROM interaction section 2019-03-18 12:00:47 -07:00
paigehargrave a15783c694
Minor syntax updates 2019-03-17 12:47:00 -04:00
paigehargrave c191ecf594
Minor syntax fixes 2019-03-17 12:46:01 -04:00
paigehargrave e7fc879f08
Update compose-file-v2.md 2019-03-17 12:44:15 -04:00
Frank Lemanschik 0934b5baa7
Update index.md 2019-03-16 03:43:51 +01:00
Frank Lemanschik 918a65fb46
Update compose-file-v2.md 2019-03-16 03:43:19 +01:00
Usha Mandya 53b9498ab4
Revert "Compose: Update build docs, Add --quiet flag" 2019-03-13 17:49:32 +00:00
Usha Mandya 9ce6ea8d27
Merge pull request #8418 from akshitgrover/master 
Compose: Update build docs, Add --quiet flag
 2019-03-13 04:34:55 -07:00
Maria Bermudez ccbb5e2630 Revert "Revert "Merge branch 'master' of github.com:docker/docker.github.io"" 
This reverts commit 4b5fbbdbc9.
 2019-03-08 10:53:00 -08:00
Akshit Grover 816fff73ae
Compose: Update build docs, Add --quiet flag 2019-03-07 19:46:32 +05:30
L-Hudson 927d53239b
Update install.md 
editorial crx
 2019-03-06 17:01:25 -05:00
Maria Bermudez 1e513418ca
Capitalize product name 2019-03-06 10:10:38 -08:00
Sebastiaan van Stijn 25fffa2f18
Compose: put Windows Server in its own tab for installation 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-03-06 14:01:35 +01:00
Sebastiaan van Stijn f6ed1b7725
Clarify that compose installation is for stable release 
This patch updates the compose installation instruction to
be more clear about the default instructions installing
the current stable release.

Inline nodes about installing different versions has been
reduced, and the "Master builds" section has been renamed
to "Install pre-release builds", to capture installing either
"master" builds, or pre-releases (release-candidates) from
GitHub.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-03-06 13:21:54 +01:00
Marcel Partap 580312e771
stop_signal supported with docker stack deploy 
support was added nearly two years ago,
c.f. https://github.com/docker/cli/issues/370
 2019-03-04 17:29:31 +01:00
Paige Hargrave 4b5fbbdbc9 Revert "Merge branch 'master' of github.com:docker/docker.github.io" 
This reverts commit 813f45bdd7, reversing
changes made to 2349c62566.
 2019-02-28 13:11:13 -05:00
Maria Bermudez 46b8b5a1bc
Merge pull request #8174 from docker/compose-legacy-option 
Thank you, @seemethere !
 2019-02-26 18:21:29 +00:00
L-Hudson 30807046cd
Merge pull request #7416 from artdgn/master 
Clarifying some confusing explanations for limiting cpus resource.
 2019-02-26 07:53:36 -05:00
Usha Mandya 51cac2184d content updates for #8092 2019-02-20 17:24:16 +00:00
Usha Mandya 66c4cdd5b4 Merge branch 'patch-1' of git://github.com/TheRijn/docker.github.io into TheRijn-patch-1 2019-02-20 17:19:08 +00:00
Frank Lemanschik 3a553b9e3f
Update index.md 
corrected typo buld => build
 2019-02-14 08:50:24 +01:00
Frank Lemanschik d913946246
Update compose-file-v2.md 
corrected typo buld => build
 2019-02-14 08:49:56 +01:00
Frank Lemanschik f314f2cd51
Update compose-file-v2.md 
Updated Documentation section ARGS added a note about the fact that ARG defined befor FROM is not there after FROM without explicit adding it again after FROM
 2019-02-14 08:33:45 +01:00
Frank Lemanschik ba09fac0b9
Update index.md 
Updated ARGS section to point out that args defined befor FROM in Dockerfiles do not get regonized after FROM without explicit redeclartion
 2019-02-14 08:30:48 +01:00
L-Hudson 8292e0dc29
Merge pull request #8198 from thaJeztah/note_picking 
Use consistent formatting for notes
 2019-02-12 11:59:49 -05:00
Sergey Bon 5d944298d9 Fix typo: docker_compose.yml -> docker-compose.yml 2019-02-09 15:11:15 +02:00
Maria Bermudez 5b0d915c2a
Minor edits 2019-02-08 18:08:48 -08:00
Maria Bermudez bb89dc1465
Rework autocompletion page 2019-02-08 18:05:13 -08:00
Sebastiaan van Stijn 03d5b3396d
Use consistent formatting for notes 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-02-09 00:49:57 +01:00
Maria Bermudez e9272d0977
Specify that mac_address is a legacy option 2019-02-06 18:07:30 -08:00
paigehargrave 1ac18238e2
Merge pull request #6385 from KevM/patch-1 
Fix `-OutFile` argument to be the correct path
 2019-02-06 17:06:18 -05:00
Wi1dcard f6deeeafd1
Remove non-sense angle brackets. 2019-02-06 00:24:12 +08:00
Daniel Compton 8994637b41
Note extending individual services only works up to version 2.1 
Adds a note that the `extends` field only works up to version 2.1 
at the header of the page.
 2019-01-31 13:24:42 +13:00
Daniel Compton 59eec9832b
Remove leading whitespace in code blocks from Django docs 2019-01-30 15:20:43 +13:00
Marijn Jansen c69a3fad5d
Added docker-compose for oh-my-zsh autocomplete 2019-01-29 14:09:21 +01:00
T.D. Gonzales 98e825dd39
Adding wordpress environment variable. 
Wordpress needs to know what db to it's user has access to. Without this mysql throws access denied errors.
 2019-01-28 21:12:09 -07:00
Adzim Zul Fahmi cd7f8e5246 fixing typo 2019-01-18 22:55:50 +07:00
paigehargrave 776e10040d
Merge pull request #7404 from sasidhar/patch-1 
Added setup instructions for oh-my-zsh
 2019-01-17 11:21:02 -05:00
Maria Bermudez 565537843b
Merge pull request #6725 from 2tunnels/patch-1 
update compose django example
 2019-01-15 16:57:40 -08:00
paigehargrave 0dab4ade68
Merge branch 'master' into name-change-for-Docker-Desktop 2019-01-14 11:14:48 -05:00
paigehargrave b47ac9ae3b
Update index.md 2019-01-11 16:10:52 -05:00
paigehargrave 2788fa1bf0
Update rails.md 2019-01-11 15:09:13 -05:00
paigehargrave 92e6fb2039
Update django.md 2019-01-11 15:05:51 -05:00
paigehargrave 695bc2a1b2
Update wordpress.md 2019-01-11 14:50:25 -05:00
paigehargrave d04138d726
Update install.md 2019-01-11 13:59:12 -05:00
paigehargrave e619f14c6e
Update bundles.md 2019-01-11 13:55:47 -05:00
paigehargrave e22dff1b59
Update aspnet-mssql-compose.md 2019-01-11 13:17:48 -05:00
paigehargrave 661100cce2
Update gettingstarted.md 2019-01-11 13:15:16 -05:00
L-Hudson 387d1a14f7
Update index.md 
Editorial crx
 2019-01-10 11:45:35 -05:00
Maria Bermudez dba97175ff
Merge branch 'master' into patch-1 2019-01-10 06:48:27 -08:00
Maria Bermudez 83fc215c81
Update rails.md 2019-01-02 18:38:28 -08:00
Maria Bermudez 44c4327630
Merge branch 'master' into compose-rails 2019-01-02 18:02:44 -08:00
Maria Bermudez 7d2f8cfc89 Fix merge conflicts and incorporate content feedback 2019-01-02 17:57:47 -08:00
Norman Kämper-Leymann 9c4ebb876c Update rails.md 
Remove `restart: always` again.
 2019-01-02 17:44:07 -05:00
Norman Kämper-Leymann 3238740467 Update rails.md 
It occupied me quite a while figuring out why this sample didn't have a restart policy. And why we where supposed to always properly stop the containers wheres you normally would simply hit `Ctrl+C`.

Turned out that this `pid` issue is a rails-specific issue. https://github.com/docker/compose/issues/1393#issuecomment-99988242

And of course there's already [a Gem for fixing that](https://github.com/lorenzosinisi/shutup) but having the one-liner in the `docker-compose.yml` keeps the logic where it belongs to (and now also is treated here in the sample).
 2019-01-02 17:44:07 -05:00
paigehargrave 6e8f675f25
Update rails.md 2019-01-02 17:27:34 -05:00
Maria Bermudez e6edbdd945
Merge pull request #7178 from adamancini/patch-8 
Merging based on previous conversation
 2019-01-02 13:42:00 -08:00
Maria Bermudez d153ba5527
Merge pull request #7959 from Mario-Hofstaetter/master 
Bump docker-compose version in docs to 1.23.2
 2019-01-02 12:14:20 -08:00
Maria Bermudez e6ec3d41c9
Merge pull request #7875 from londoncalling/PR-3903-docker-restart-options 
Related pages links for docs per suggestion in PR#3903
 2019-01-02 10:56:27 -08:00
Maria Bermudez 1a5c6b7287
Merge pull request #7679 from waclawjacek/patch-1 
Mark "docker-compose down" as code, not a link
 2019-01-02 10:39:33 -08:00
Mario-Hofstaetter 85ca4054fc
Update install.md 
Update build hash for version 1.23.2
 2019-01-01 22:27:24 +01:00
paigehargrave 2788a53481
Merge pull request #7728 from siyu6974/patch-1 
Update example for deprecated name
 2018-12-28 13:09:11 -05:00
Maria Bermudez da0c9b2dfd
Merge pull request #6851 from lenestopage/patch-8 
Update install.md
 2018-12-28 09:07:10 -08:00
Anne Henmi 5415ab38c5
Update install.md 
Cleaned up wording and formatting.
 2018-12-28 09:56:30 -07:00
Maria Bermudez da2c213b6a
Merge pull request #7623 from twright-msft/patch-1 
Update pull location for SQL Server Linux container images to pull from mcr.microsoft.com - the new official registry
 2018-12-27 12:32:01 -08:00
Anne Henmi 30c6242a3e
Merge pull request #7624 from shin-/c4601-exclusive-external 
Update docs for volume and networks about the changed behavior of the external key
 2018-12-26 10:01:30 -07:00
Victoria Bialas fc805761fd re-wrote intro per review comments 
Signed-off-by: Victoria Bialas <vicky@thoughtspot.com>
 2018-12-25 17:39:59 -08:00
Maria Bermudez c01ab3cbda
Clarify versions of secrets config samples 2018-12-19 17:19:42 -08:00
Maria Bermudez 500c265a09
Merge branch 'master' into patch-1 2018-12-18 13:27:43 -08:00
Siyu aac5701eae
Update index.md 2018-12-18 10:44:53 +01:00
Siyu c52e3c834e
Add back old example but mark as deprecated 2018-12-18 10:44:10 +01:00
Victoria Bialas 8e9e0813ba related pages links for docs per suggestion in PR#3903 
Signed-off-by: Victoria Bialas <vicky@thoughtspot.com>
 2018-12-17 12:49:45 -08:00
Maria Bermudez 114baa4c13 Merge branch 'master' of github.com:docker/docker.github.io 2018-12-11 12:23:20 -08:00
L-Hudson a955b4a7a2
Merge pull request #7836 from dimaqq/master 
Document consistency flag in mounts
 2018-12-11 08:29:30 -05:00
Dima Tisnek 6dd9fa00e9 Document consistency flag in mounts 2018-12-11 12:46:25 +09:00
Maria Bermudez 4bdcbf8ae9 Merge branch 'master' of github.com:docker/docker.github.io 2018-12-10 12:41:24 -08:00
L-Hudson fc1e6c0812
Merge pull request #7420 from vitorreis/patch-1 
NOREF - Fix Invalid docker-compose.yml in wordpress sample
 2018-12-10 09:27:44 -05:00
Siyu 915f740182
Update example for deprecated name 
secret.external.name is deprecated in favor of secret.name
 2018-11-20 12:43:08 +01:00
Jeffrey Morgan ca4ffb1ee2 Merge branch 'master' into consolidation-changes 2018-11-14 18:30:02 -05:00
Jeffrey Morgan d15739c5e7 Merge branch 'master' into consolidation-changes 2018-11-14 18:29:09 -05:00
Waclaw Jacek 8c453b4a96
Make command reference links inline. Props @thaJeztah 2018-11-14 12:49:36 +01:00
Waclaw Jacek bea899abb0
Mark "docker-compose down" as code, not a link 
To make it clear `docker-compose down` is a command, mark it as code and include a link to documentation below.
 2018-11-14 10:48:08 +01:00
newoneforasn4 df5a088e39
Restructured sentence for better flow 2018-11-13 11:46:05 -08:00
Henré Botha 5c0fe6c663
Fix ordering of service config reference 2018-11-12 14:57:27 +02:00
Joffrey F 2efd2456d7 Update docs for volume and networks about the changed behavior of the external key 
in newer versions of the format

Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-11-06 16:02:54 -08:00
Travis Wright 26cf276664
Update aspnet-mssql-compose.md 2018-11-06 08:12:06 -08:00
Maria Bermudez d77365f0ed
Merge pull request #7447 from shin-/compose-1.23-update 
Update release notes and reference for upcoming Compose 1.23.0 release
 2018-10-30 14:29:39 -07:00
Maria Bermudez 441c5b572b
Minor edits 2018-10-30 14:20:20 -07:00
Joffrey F 5a2e15dc04 Final Compose 1.23.0 updates 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-10-29 11:50:49 -07:00
Jeffrey Morgan ca466a55ed Rename Docker Store and Docker Cloud - WIP 2018-10-04 19:41:32 -04:00
Maria Bermudez eb608ee28d
Merge branch 'master' into spelling 2018-10-04 12:18:34 -07:00
Joffrey F d5b9b8bf0f Update release notes and reference for upcoming Compose 1.23.0 release 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-09-28 12:42:43 -07:00
Vitor Reis 1596b778fe
NOREF - Fix Invalid docker-compose.yml sample 
Without specifying this the user gets:
docker-compose up -d
ERROR: Top level object in './docker-compose.yml' needs to be an object not '<class 'NoneType'>'.
 2018-09-25 21:30:57 +02:00
arthur_x1 7753a6cd5a Clarifying confusing explanations for limiting cpus resource in docker-compose file to prevent misunderstanding as "percent of total CPU available". 2018-09-25 10:55:18 +10:00
Anne Henmi db6eef42ff
Merge pull request #7212 from miguelius/patch-1 
Update startup-order.md
 2018-09-24 16:18:01 -06:00
Anne Henmi f304032e1b
Merge pull request #7186 from scjane/patch-109 
Update aspnet-mssql-compose.md
 2018-09-24 15:57:31 -06:00
Anne Henmi 47a0fb1509
Merge pull request #7210 from qhan1028/patch-1 
line 32 need a tab.
 2018-09-24 15:57:19 -06:00
Oscar Caballero 269c80d2d9 Spelling revision 2018-09-23 21:43:11 +02:00
Sasidhar Vanga 62065e5a8b
Add setup instructions for oh-my-zsh 2018-09-20 22:54:18 -07:00
Anne Henmi 027a52ee89
Merge pull request #7022 from tstrass/patch-1 
Update URI for Docker Compose version 1
 2018-09-11 09:00:24 -06:00
Ali Oğuzhan Yıldız 9031360ae7
rename psycopg2 to psycopg2-binary 2018-09-11 13:23:10 +03:00
Anne Henmi ca5e9bbc77
Merge pull request #6947 from 3mmarg97/patch-1 
Update install.md. Tested on BASH and ZSH.
 2018-09-05 09:13:10 -06:00
Miguel Carboni 32ded5f6fe
Update startup-order.md 2018-08-13 16:21:29 -03:00
Qhan Lin a2fe5b1851
line 32 need a tab. 2018-08-13 16:28:28 +08:00
Brett Randall 8d8b00b2d2 Fixed anchor error #depends-on -> #depends_on. 
Target https://docs.docker.com/compose/compose-file/#depends_on .

Signed-off-by: Brett Randall <javabrett@gmail.com>
 2018-08-10 19:21:38 +10:00
Wang Jie 8ad8044c7f
Update aspnet-mssql-compose.md 2018-08-08 19:29:42 +08:00
Tammy Fox f0d9920b43
Merge pull request #7145 from camsteffen/patch-2 
fix init example version
 2018-08-06 16:13:07 -04:00
Tammy Fox 259b9e79bc
Merge pull request #7107 from nielssorensen/patch-1 
Insert shell env var into env var priority order
 2018-08-06 16:07:18 -04:00
Tammy Fox 27d22a2e8d
fix list formatting 2018-08-06 16:07:11 -04:00
ada 5e8f7a25ab
NFS example for driver_opts 
People ask me how to do this all the time, and I can't find a good example documented anyhwere else.  I figure this is a better example of the actual usage of the driver_opts parameter with a real-world use case.
 2018-08-06 13:42:15 -04:00
Cameron Steffen 35cefb2f73
fix init example version 2018-07-31 04:11:26 -05:00
Tammy Fox 9a0cb8c058
Merge pull request #6975 from sascha-egerer/patch-4 
Fix copy and paste error
 2018-07-26 00:35:28 -04:00
Niels Sorensen 1b85085ca9
Insert shell env var into env var priority order 
As mentioned in lines 115 through 117, "Values in the shell take precedence over those specified in the `.env` file. If you set `TAG` to a different value in your shell, the substitution in `image` uses that instead:".

This context should also be represented in the order of priority in which variables are processed.
 2018-07-25 15:36:01 -04:00
Tammy Fox 146a8aebe1
Merge pull request #6954 from alecthegeek/patch-1 
Fix broken link
 2018-07-23 13:54:15 -04:00
Tammy Fox 2d0d59d868
oops, fix link again 2018-07-23 13:48:06 -04:00
Tammy Fox 1df778493c
make link relative 2018-07-23 13:46:18 -04:00
Mohamed Amine LEGHERABA 4a925475ce
update dotnet data 
aspnet core image is depreciated
need to use dotnet:2.1-sdk image to build aspnet app
and dotnet:2.1-aspnetcore-runtime to run them
 2018-07-17 15:08:25 +02:00
Tom Strassner d490343548
Update URI for Docker Compose version 1 2018-07-12 15:04:55 -04:00
Joffrey F caad3ebe13 1.22.0 release notes and documentation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-07-05 13:32:51 -07:00
Sascha Egerer 1165708794
Fix copy and paste error 
"networks" must be "volumes" at that place
 2018-06-30 22:04:59 +02:00
Alec Clews bcaaad7c3c
Fix after review 2018-06-29 17:08:58 +10:00
Yang Luo e74fd60201 Add the missing backtick 2018-06-28 15:26:03 -07:00
Alec Clews 410d05cc4d
FIx broken link 
Link to variable substitution was borked
 2018-06-28 07:33:41 +10:00
Ammar Al-Khawaldeh e93b988c87
Update install.md 
In zsh you can't use command line variables in url. By adding double quotation the install command will work with both zsh and bash.
 2018-06-26 20:34:52 +03:00
Oren f490bd1752 Update docker-compose run --rm doc (#6803) 
* Update docker-compose run --rm doc

To make the functionality added in
24ab933ebf
explicit in the docs

* Rewrite change as an addendum

Rewrite the change to the end of the page as an addendum to the description of the inner workings of the run command.
 2018-06-19 14:58:30 -07:00
Ben Creasy 14ef9244e3 Cannot find reference to --net 
Is network intended? It looks like this is talking about https://docs.docker.com/engine/reference/run/#network-settings
 2018-06-15 14:59:56 -07:00
Sascha Egerer ba950b14b6 Fix some broken links 2018-06-15 14:58:07 -07:00
lenestopage 6bc0bd1fc5
Update install.md 2018-06-08 12:04:51 -04:00
Takahiro Naito 247cde1bdb update rails.md for Ruby 2.5 and Rails 5.2 (#6771) 2018-06-01 09:00:21 -07:00
Thad Guidry f1ec5d916a Added mention of new Custom Network naming since 3.5 (#6747) 2018-05-24 12:26:05 -07:00
Sascha Egerer ec789e4ff3 Fix links to compose-file in networking (#6752) 2018-05-24 09:34:54 -07:00
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 - `&#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
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