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

1405 Commits

Author SHA1 Message Date
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