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

1337 Commits

Author SHA1 Message Date
Maria Bermudez aaca9b83b5 Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"" 
This reverts commit 4c95d161ca.
 2018-08-29 19:01:03 -07:00
Maria Bermudez 4c95d161ca Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2" 
This reverts commit af5f2fcc38, reversing
changes made to 338b690d26.
 2018-08-29 18:37:44 -07:00
Maria Bermudez 840c167055 Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2"" 
This reverts commit 14080c18bd.
 2018-08-29 18:36:03 -07:00
Maria Bermudez 14080c18bd Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2" 
This reverts commit af5f2fcc38, reversing
changes made to 338b690d26.
 2018-08-29 14:47:31 -07: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
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
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
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
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
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