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

1482 Commits

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