docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
51,523 Commits 21 Branches 28 Tags 816 MiB
Commit Graph

1429 Commits

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