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

1419 Commits

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