Commit Graph

44416 Commits

Author SHA1 Message Date
Joao Fernandes 7d77fa4d91 Merge pull request #746 from joaofnfernandes/ddc-aws
Introduce DDC for AWS
2016-11-29 14:12:04 -08:00
Joao Fernandes c73ccec06a Updates DDC for AWS docs 2016-11-29 13:58:50 -08:00
Nicola Kabar 7874394deb ddc-d4a docs
Signed-off-by: Nicola Kabar <nicolaka@gmail.com>
2016-11-29 13:58:49 -08:00
Eisenberger Tamás c717eb71f7 Document virtualbox-share-folder switch of docker-machine virtual box… (#647)
* Document virtualbox-share-folder switch of docker-machine virtual box driver

* Add --virtualbox-share-folder to the fefaults table too

* Updated wording for virtualbox-share-folder

* Update virtualbox.md
2016-11-29 13:56:44 -08:00
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
LRubin 82acde4105 file for visual check of various formatting (#585)
Signed-off-by: LRubin <lrubin@docker.com>
2016-11-29 13:45:27 -08:00
John Mulhausen 64fb7306ca Update Gemfile 2016-11-29 12:18:03 -08:00
John Mulhausen 586407deff Merge pull request #739 from Varentsov/patch-1
Fix access denied
2016-11-29 11:58:01 -08:00
John Mulhausen 84cbb88f75 Merge pull request #740 from seeekr/patch-1
fix typo in spec/api.md
2016-11-29 11:57:13 -08:00
John Mulhausen 3e84ae65f6 Merge pull request #743 from andrewhsu/revert-yakkety
revert yakkety addition for now
2016-11-29 11:56:42 -08:00
Andrew Hsu faf64b79f6 revert yakkety addition for now
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2016-11-29 10:53:43 -08:00
Aanand Prasad 8524552f99 Update Compose file reference for version 3
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-29 17:53:11 +00:00
Denis Andrejew 0475fe3b6f fix typo in spec/api.md 2016-11-29 16:53:34 +00:00
Sebastiaan van Stijn 951b19a398 Merge pull request #627 from docker/325_volume_create_opt_syntax
Fix syntax for passing options to `volume create`
2016-11-29 17:03:29 +01:00
Varentsov 39f87cbc6a Fix access denied 2016-11-29 12:17:52 +03:00
Joao Fernandes 01eca2e2f1 Merge pull request #735 from joaofnfernandes/dtr-remove
Improve instructions to uninstall DTR
2016-11-28 17:04:17 -08:00
Joao Fernandes 1894591d43 Improve instructions to uninstall DTR 2016-11-28 16:59:01 -08:00
John Mulhausen eebf584fb3 Merge pull request #674 from thaJeztah/optimize-dockerfile
Optimize Dockerfile
2016-11-28 16:35:26 -08:00
Misty Stanley-Jones d74f9153b9 Merge pull request #412 from mstanleyjones/troubleshooting_volume_errors.md
Add topic about troubleshooting volume problems
2016-11-28 16:15:54 -08:00
Misty Stanley-Jones e6b0ccbd67 Merge pull request #733 from mstanleyjones/udp_port_publishing
Document publishing a UDP port
2016-11-28 16:01:18 -08:00
Misty Stanley-Jones c4c047f5f2 Add to swarm admin docs
- Add details about maintaining quorum
- Add details about pending tasks

Relates to #26017
Relates to #25069

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-28 15:59:18 -08:00
Misty Stanley-Jones 1b8631d28c Document publishing a UDP port
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-28 15:41:00 -08:00
John Mulhausen 90819b7133 Merge branch 'master' of https://github.com/docker/docker.github.io 2016-11-28 15:00:23 -08:00
John Mulhausen c49c5ec2c6 Merge branch 'stefanwuthrich-patch-1' 2016-11-28 15:00:06 -08:00
John Mulhausen 526a9b90ab Fixing merge conflict 2016-11-28 14:59:56 -08:00
John Mulhausen 70617e697b Adding Yakkety to opening list 2016-11-28 14:58:10 -08:00
John Mulhausen 921964a17c s/sizes/size 2016-11-28 14:55:56 -08:00
John Mulhausen 0891e122cf Merge pull request #408 from yangyuqian/explain_downloaded_image_and_container_size
Explain downloaded image and container sizes
2016-11-28 14:55:08 -08:00
Misty Stanley-Jones 1bc1addd32 Merge pull request #300 from amincheloh/patch-1
Update swarm/install-manual.md
2016-11-28 14:53:31 -08:00
John Mulhausen 2e5892e4a5 Writerly changes 2016-11-28 14:52:55 -08:00
Misty Stanley-Jones cc166f9ac7 Merge branch 'master' into patch-1 2016-11-28 14:48:36 -08:00
John Mulhausen 03763b45b1 Merge branch 'SCBuergel-patch-1' 2016-11-28 14:44:31 -08:00
John Mulhausen 2f817e465b Fix merge conflicts 2016-11-28 14:44:22 -08:00
John Mulhausen a5bf14e5f9 Merge pull request #334 from mstanleyjones/run_reference_reorg
Add topic about limiting container resources
2016-11-28 14:37:10 -08:00
John Mulhausen d621663c6f Removing superfluous example command 2016-11-28 14:28:42 -08:00
John Mulhausen ace5a7a952 s/syntax/command 2016-11-28 14:27:55 -08:00
John Mulhausen 62c35fd46b Merge branch 'friism-patch-1' 2016-11-28 14:22:56 -08:00
John Mulhausen e44ca4b758 Fix merge conflicts 2016-11-28 14:22:14 -08:00
John Mulhausen 74523ae57d Metadata fix 2016-11-28 14:17:31 -08:00
John Mulhausen 6dc1e38a52 Merge pull request #732 from rvernica/patch-1
Fix link to link_local_ips in docs
2016-11-28 14:14:42 -08:00
Misty Stanley-Jones 554b2c9967 Pull distribution reference docs from upstream 2016-11-28 13:51:52 -08:00
Rares Vernica 2d813e26fd Fix link to link_local_ips 2016-11-28 13:40:17 -08:00
Joao Fernandes 52ec9c945d Merge pull request #730 from joaofnfernandes/dtr-typo
Fix typo in DDC release notes
2016-11-28 13:32:37 -08:00
John Mulhausen 4263edb41f Merge pull request #103 from mbentley/update-ubuntu-cs-engine-docs
Add additional package for aufs support; fixes #74
2016-11-28 13:23:25 -08:00
Joao Fernandes fa4b1dd3c8 Fix typo in DDC release notes 2016-11-28 13:13:12 -08:00
Misty Stanley-Jones f9897d3b43 Fix doubled period 2016-11-28 12:40:40 -08:00
Misty Stanley-Jones a9e535f3bd Merge pull request #610 from fbouliane/add-dns-host-to-instructions
Add DNS SubjectAltName to certificate recipe
2016-11-28 11:59:16 -08:00
John Mulhausen 2107bd3546 Merge pull request #728 from mstanleyjones/fix_doubled_words
Fix some doubled words
2016-11-28 11:50:56 -08:00