Commit Graph

960 Commits

Author SHA1 Message Date
John Mulhausen
ebe778b906 Update imports to work properly (#1221)
Update imports to work properly
2017-01-20 09:58:54 -08:00
Victoria Bialas
3b314c12db draft 3 voting app sample updates
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-19 22:14:44 -08:00
Tim Smid
7063c5e921 Add notice for unsupported Compose file option when deploying stack. 2017-01-19 21:33:45 -08:00
Tim Smid
1e6b46b700 Add notice for ignored Compose file options when deploying a stack. 2017-01-19 21:33:45 -08:00
Joffrey F
19777ec0b9 Add new depends_on syntax documentation (#1031)
Miscellaneous fixes

Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-19 21:25:03 -08:00
Jari Takkala
5eb55e8414 Add sysctls option documentation
Describe the sysctls compose-file option.
2017-01-19 21:25:03 -08:00
Aanand Prasad
6c9616177e Update Compose file reference for version 3
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2017-01-19 21:24:59 -08:00
Yong Wen Chua
8c458d4d82 Add documentation for service userns_mode key 2017-01-19 21:24:05 -08:00
Misty Stanley-Jones
3af3a8b7a2 Merge pull request #1146 from shin-/ipv6_networks_compose
Update instructions for IPv6-enabled networks
2017-01-18 15:28:22 -08:00
Victoria Bialas
749701f7d9 minor copyedits (#1148)
* minor copyedits

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-18 15:27:27 -08:00
Victoria Bialas
ec839d5bf8 Merge pull request #1007 from NickvdMeij/patch-2
Update overview.md
2017-01-17 23:23:32 -08:00
Joffrey F
efb8c5e492 Update instructions for IPv6-enabled networks
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-17 15:43:52 -08:00
LRubin
a3a53fc3ff more more link link fixes fixes
Signed-off-by: LRubin <lrubin@docker.com>
2017-01-11 15:02:28 -08:00
LRubin
fde978afc5 more link fixes
Signed-off-by: LRubin <lrubin@docker.com>
2017-01-11 14:43:52 -08:00
Nick van der Meij
e5e2b2d34a Update overview.md
Update overview.md to reference possible issues regarding windows to unix path convert issues
2016-12-30 21:46:29 +01:00
Misty Stanley-Jones
0d7778af0c Merge pull request #991 from sergei-solomonov/patch-1
typo fixed
2016-12-29 14:28:10 -08:00
Sergei
b6a8bfc1ac Excess '>' symbol deleted 2016-12-29 00:31:29 +07:00
Sergei
b0ccda058e typo fixed 2016-12-28 23:06:39 +07:00
Peter Dave Hello
5919563eb8 Lossless Image optimization (#959)
* re-compress jpg images losslessly using jpegoptim

* re-compress png images losslessly using zopflipng
2016-12-21 11:12:13 -08:00
Dan Keder
36ac04c1fa Add a note to env_file option (#932)
* Add a note to `env_file` option
2016-12-19 15:02:42 -08:00
Misty Stanley-Jones
dc22bdd7e8 Merge pull request #879 from buuren/patch-2
Update environment-variables.md
2016-12-19 14:22:17 -08:00
buuren
3275110fb1 Update environment-variables.md
Anchor #env-file does not exist. Correct anchor is #envfile
2016-12-14 12:18:37 +02:00
Dan Shumaker
d3bec385f1 Update index.md 2016-12-13 12:06:37 -05:00
Victoria Bialas
1939c2cd19 Merge pull request #684 from aanand/update-compose-getting-started
Updates to Compose getting started guide
2016-12-08 17:15:51 -08:00
Adam Stevenson
855e532435 Update db:create to use latest recommended format (#787)
Latest best practice is use `rails` vice `rake`.
http://guides.rubyonrails.org/command_line.html#db
2016-12-08 12:21:46 -08:00
Victoria Bialas
7ce29c9a76 Merge pull request #817 from londoncalling/banner-for-old-swarm-docs
added advisory banner to legacy swarm docs w/links to swarm mode
2016-12-06 23:08:17 -08:00
Victoria Bialas
59c5544d8b added advisory banner to legacy swarm docs w/links to swarm mode
copyedit

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-12-06 17:03:45 -08:00
Aanand Prasad
d9efcc4df1 Add note about .env file to variable substitution docs (#801)
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-12-06 16:41:21 -08:00
Aanand Prasad
9407f9ef05 Update docs around entrypoint option (#712)
- Clarify that setting `entrypoint` overrides both the entrypoint and
  the command on the image

- Fix the incorrect examples in the doc on startup order, which assumed
  that the default command would not be overridden

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-12-06 16:40:12 -08:00
Aurelien HAVET
88154eacbe fix error on swarm constraint exemple (#749)
Constraints for Swarm scheduling are defined as an **environment** option, according to the example in the section *Manual scheduling*, and not as a **label** option
2016-11-30 11:40:05 -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
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
Aanand Prasad
b08c014fd8 Updates to Compose getting started guide
- Some wording and formatting tweaks
- Use Python 3.4, because it's 2016
- Use Alpine-based images for faster downloads and less disk space usage
- Use the list form of `CMD` in the Dockerfile, so it's not wrapped in
  sh
- Remove the `depends_on` from `docker-compose.yml`, as it's not really
  needed - the web app connects to Redis when it's visited, not on
  startup
- Add a section on updating the app and seeing the changes, because
  that's the point of mounting the code in!
- Add a note about `docker-compose down`

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-22 16:33:43 +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