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
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
newoneforasn4
df5a088e39
Restructured sentence for better flow
2018-11-13 11:46:05 -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
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
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
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
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
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
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
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