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

929 Commits

Author SHA1 Message Date
Bo-Yi Wu d9a5c2666a update to 1.9.0 version (#699) 2016-11-29 13:55:06 -08:00
Adam Stevenson 53da48206b Update to Rails 5, Ruby 2.3.3, remove therubyracer (#718) 
* Update to Rails 5, Ruby 2.3.3, remove therubyracer

Update packages to latest versions. The actual nodejs is installed on line 18. Changed to a general comment regarding the need to rebuild images when adding gems.

* update rails welcome screenshot to 5.0.0.1
 2016-11-29 13:52:16 -08:00
Ryan Ore a086af7a8b rails.md: change the database.yml in the example (#701) 
In this example,  database.yml uses the default value of `postgres` for the `database` key.  
The database postgres is normally not used for user data, but for administrative purposes.  This means people following this example will not be able to drop the database, and in general it's just not a great idea.
 2016-11-29 13:50:01 -08:00
Varentsov 39f87cbc6a Fix access denied 2016-11-29 12:17:52 +03:00
Rares Vernica 2d813e26fd Fix link to link_local_ips 2016-11-28 13:40:17 -08:00
Misty Stanley-Jones 756f4d974c Fix some doubled words 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-28 11:32:17 -08:00
Joe Lemmer 07fdd239c7 Update extends.md 
Just corrected a missing 'and'
 2016-11-22 20:12:14 +00:00
Victoria Bialas a259f45166 clarified use of .yml and .yaml for Compose file, both can be used 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-11-18 12:21:51 -08:00
John Mulhausen 0b71b84ad4 Merge pull request #550 from davidwilliamson/patch-1 
Update compose example to work better with swarm
 2016-11-17 17:30:14 -08:00
John Mulhausen 7caec61ef4 Merge pull request #573 from alternatekev/patch-1 
Update wordpress.md
 2016-11-17 15:27:46 -08:00
LRubin 7da6a0bd21 add 'none' cue to large screentext block 
...to prevent weird syntax highlighting.
 2016-11-17 09:31:06 -08:00
Victoria Bialas b2eb693d00 Merge remote-tracking branch 'upstream/master' into vnext-compose-1.9.0-merge 2016-11-16 12:03:45 -08:00
John Mulhausen 9a39f03cb7 Merge pull request #595 from ankon/patch-1 
Use curl's -o to specify the output
 2016-11-16 11:42:48 -08:00
John Mulhausen 698f8d26f4 Merge pull request #593 from jefferybradberry/patch-1 
There are two differences
 2016-11-16 11:34:18 -08:00
Victoria Bialas 1249d35fca added troubleshooting info about shared drives/files and volume mounting 
added more changes

updated per Nathan's comments on properly documenting directories formats for all platforms

incorporated Daniel's review comments, and added a clarification re: users' dir

copyedits

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-11-16 11:02:04 -08:00
Andreas Kohn f07aa9e026 Use curl's -o to specify the output 
This makes it easier to fix up the command by just prepending a `sudo` if something goes wrong.
 2016-11-16 13:05:30 +01:00
Jeffery Bradberry b68ad3aced There are two differences 
Add missing word.
 2016-11-16 04:43:22 -05:00
Kevin Conboy c4d4069279 Update wordpress.md 
capital_P_dangit()
 2016-11-15 09:47:54 -07:00
David Williamson 186dfbb336 Update compose example to work better with swarm 
Update the compose example:

* Remove the `links` directive. This allows swarm to distribute containers across available nodes. (with the `links` directive, swarm will be forced to run both containers on the same node.) Note that the `depends_on` directive is sufficient to ensure correct container start up sequence.
* Use a docker volume instead of bind mounting a local directory.
* Give docker-compose commands for shutting down the Wordpress app, showing how to preserve or remove the persisted data in the volume.

Verified proposed change works correctly in both a swarm and a non-swarm environment.
 2016-11-11 14:24:39 -08:00
Jonas Friedmann 4d83c1bb08 Add missing dollar-sign / consistent shell style (#426) 
* Add missing dollar-sign

* Remove dollar-sign for single commands without output
 2016-11-10 14:54:49 -08:00
Gaetan 2ea564166d fix type of keywords entry in frontmatter (in /compose/ dir) (#481) 
keywords should be a string, not an array containing one string

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
 2016-11-07 13:18:56 -08:00
John Mulhausen 949a89e6ea Merge pull request #152 from mstanleyjones/redirect_from 
Change 'alias:' to 'redirect_from:' so aliases work again
 2016-11-04 17:34:27 -07:00
Misty Stanley-Jones f4b0ec85ff Merge pull request #339 from dave-pollock/patch-1 
Update swarm.md
 2016-11-04 17:11:40 -07:00
Misty Stanley-Jones eb5c8670bc Change instances of alias: to redirect_from: 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-04 17:07:02 -07:00
John Mulhausen 558314bf56 Converges titles to imperative-form, front-matter based, and sentence-case (#438) 
Multiple title fixes, consistency fixes, convergence into metadata-based titles.
 2016-11-04 15:38:40 -07:00
Misty Stanley-Jones ac0cef5d0f Merging master into vnext-compose 
includes conflict resolution

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-04 15:25:34 -07:00
Misty Stanley-Jones 1a193d749b Revert "Merge pull request #437 from gdevillele/fix_keywords_format" 
This reverts commit 13ddc1350e, reversing
changes made to 7a11f05943.
 2016-11-04 13:33:29 -07:00
Misty Stanley-Jones 33d3d067d0 Revert "fix some frontmatter keywords values" 2016-11-04 13:30:04 -07:00
Misty Stanley-Jones 0827ba283c Revert "fix frontmatter keywords values in compose/reference/ files" 2016-11-04 13:28:43 -07:00
Misty Stanley-Jones 13ddc1350e Merge pull request #437 from gdevillele/fix_keywords_format 
fix some frontmatter keywords values
 2016-11-04 10:50:53 -07:00
Gaetan 8bb4d6226a fix more frontmatter keywords values (#439) 
* fix format of frontmatter keyword entry in some .md files

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
 2016-11-04 10:48:38 -07:00
Joffrey F 4c3cf8e7fd Update docs to mention new additions in Compose 1.9.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-11-03 15:05:24 -07:00
Gaetan de Villele 7a11f05943 fix some frontmatter keywords values 
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
 2016-11-03 10:22:12 -07:00
Gaetan de Villele bb4f3be02e fix frontmatter keywords values in compose/reference/ files 
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
 2016-11-03 10:13:21 -07:00
Adrien Duermael 8fa5f3a5de absolute links to docs.docker.com are now relative links 
Signed-off-by: Adrien Duermael <adrien@duermael.com>
 2016-11-01 17:01:41 -07:00
Victoria Bialas 980956ef9d incorporated misty's comments 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-10-31 12:43:52 -07:00
michael-wise 870abe59b4 added a filename above the custom script 
Added a filename above the custom script to distinguish it from the wait-for-it.sh script.
 2016-10-26 21:24:36 -04:00
Victoria Bialas 9c5319211d Fixing note formatting 
Changing note format back to the way it was to match the rest of the notes in this section.
 2016-10-26 16:58:24 -07:00
Victoria Bialas 568cded2a5 finishing touches on Wordpress example in Compose docs per pr#129 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-10-26 13:46:53 -07:00
John Mulhausen be3e860fa1 Merge pull request #328 from alexandair/patch-1 
Update index.md
 2016-10-25 14:25:52 -07:00
Victoria Bialas 7fd5e20337 Update ps.md 2016-10-25 11:38:33 -07:00
Victoria Bialas e65a98ef9f Update install.md 2016-10-25 11:24:45 -07:00
Victoria Bialas 50d7898fe4 Update gettingstarted.md 2016-10-25 11:22:30 -07:00
Victoria Bialas 100a82043a Update gettingstarted.md 2016-10-25 11:18:39 -07:00
dave-pollock 1967bd2603 Update swarm.md 
Scheduling filters should be configured in the environment section of compose files - NOT labels.
 2016-10-25 14:57:00 +01:00
Markus Schulte 1de1d10073 At paragraph "links", fixed anchor-link to "depends-on" 2016-10-24 12:01:00 +02:00
Aleksandar Nikolić 18499881e5 Update index.md 
Fix typo.
 2016-10-23 20:12:47 +02:00
Joao Fernandes bce5d70ce6 Updates compose install to 1.8.1 
Signed-off-by: Joao Fernandes <joao.fernandes@docker.com>
 2016-10-19 15:57:43 -07:00
DavidRabel-b1 673523ee9a Update django.md 
As of Django 1.10 the database backend django.db.backends.postgresql_psycopg2 is called django.db.backends.postgresql .

See https://docs.djangoproject.com/en/1.10/ref/settings/#engine
 2016-10-19 17:07:49 +02:00
John Mulhausen 5d9e15dcad Merge pull request #174 from IRus/patch-1 
This guide used legacy backticks.
 2016-10-18 16:35:17 -07:00