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

1124 Commits

Author SHA1 Message Date
Hugo 7b83cfebab Update rails.md 2017-03-06 20:01:57 -05:00
Piyush Maurya b582d52d94 update v1.11.1 to v1.11.2 (#2102) 2017-03-06 12:06:06 -08:00
Victoria Bialas 00d60e3054 Merge pull request #1979 from flemzord/patch-1 
Change version for docker-compose
 2017-03-02 15:34:02 -08:00
Victoria Bialas 09c432495f clarified docker stack deploy and bundles 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-03-01 18:30:48 -08:00
Joe Meissler b93760bea5 merge other changes, fix typo 2017-03-01 15:01:26 -08:00
Joe Meissler 32e4923e32 Merge branch 'master' into patch-1 2017-03-01 15:00:00 -08:00
Joe Meissler 963e6b5e6c mem_swappiness for current version and v1 2017-03-01 14:56:18 -08:00
Joe Meissler 5c87ba4009 Add documentation for mem_swappiness 2017-03-01 14:48:19 -08:00
Misty Stanley-Jones a3b95e3f0c Merge pull request #1803 from mtoothman/patch-1 
Update run.md
 2017-03-01 14:24:53 -08:00
Victoria Bialas 1b05f61663 Added "related topics" section 2017-03-01 13:47:13 -08:00
Matt d53941fa43 Update run.md 
Address PR feedback.
 2017-02-28 21:30:53 -05:00
Maxence Maireaux 28b1897289 Update install.md 2017-02-25 21:12:12 +01:00
John Mulhausen 4d93d1790b Fixes #1887 2017-02-22 13:56:50 -08:00
Misty Stanley-Jones 4576e1a6b7 Merge pull request #1921 from docker/fix-secrets-mode-doc 
Fix error about permissions in secrets doc
 2017-02-22 10:39:22 -08:00
Misty Stanley-Jones 93709c2b12 Merge pull request #1900 from shin-/missing_options_composefileref 
Updated miscellaneous list of options for each format
 2017-02-22 10:13:39 -08:00
Misty Stanley-Jones 33857cfe29 Tweaks 2017-02-22 09:49:09 -08:00
Misty Stanley-Jones 85bcea8ac1 Fix error about permissions in secrets doc 
Also link to a resource for figuring out the right mode, since not all our readers are UNIX gurus.
 2017-02-22 09:45:56 -08:00
Misty Stanley-Jones 9578525701 Merge pull request #1853 from knaperek/patch-1 
Clarify compatibility of "networks" with more recent versions of compose.
 2017-02-22 09:35:06 -08:00
Joffrey F 3e4005c360 Updated miscellaneous list of options for each format 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-21 13:11:37 -08:00
Misty Stanley-Jones ef4671f75e Document secrets in compose file reference 2017-02-21 09:09:32 -08:00
mapk0y edfcf0c485 fix broken links in composer-file/index.md (#1857) 
Signed-off-by: mapk0y <mapk0y@gmail.com>
 2017-02-20 02:48:33 -08:00
Jozef 3083031907 Update networking.md 
Clarify compatibility of "networks" with more recent versions of compose.
 2017-02-18 20:16:35 +01:00
Victoria Bialas 4a70dd4cb2 removed on-page topic menu from ref pages 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-02-17 18:02:58 -08:00
Victoria Bialas a6eb34f018 added x-ref from scale reference to replicas in v3 Compose 
incorporated Joffrey's comments

surface h1's in left menu on Compose file refs, fix liquid issue

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-02-17 17:23:52 -08:00
Andy Bulford 5160f1cf0b Remove 1.10.0 references from install.md 
These were missed from PR #1819 so also needed updating to 1.11.1.
 2017-02-17 14:30:45 -08:00
Victoria Bialas d9e2d542ca Merge pull request #1831 from londoncalling/compose-restart-link 
fixed link in Compose file, modified on-page TOC
 2017-02-17 14:18:57 -08:00
Victoria Bialas f36ad2fa3a fixed link in Compose file, expanded on-page TOC's to show more subtopics 
fixed a link to variable substition in Compose v.3

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-02-17 14:07:32 -08:00
Andy Bulford a09e279035 Update install.md to refer to version 1.11.1 2017-02-17 13:11:25 -08:00
Matt fb0f9d56bc Update run.md 
Minor grammar cleanup.
 2017-02-16 22:20:42 -05:00
Victoria Bialas 40f912237b Merge pull request #1802 from londoncalling/Compose-extends-update 
edit per Joffrey re: PR #1763
 2017-02-16 18:37:30 -08:00
Victoria Bialas 49323a1137 edit per Joffrey re: PR #1763 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-02-16 18:20:09 -08:00
Victoria Bialas e845620aaf fixed nav menus to surface Compose file reference, changed links to several manuals to overviews 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-02-16 18:06:05 -08:00
Victoria Bialas 0396353b08 Merge pull request #1763 from Electron-libre/master 
fix(compose:extends): not supported from version 3
 2017-02-16 16:35:21 -08:00
Dirk d8d822adff Added a bit more detail to restart.md (#1668) 
This killed me for a while, I expected that since environment variables were set after the build process that they would be reloaded on restart.
 2017-02-16 16:00:24 -08:00
Roque Pinel be682d4f42 Fix startup-order.md link (#1769) 2017-02-16 14:48:46 -08:00
Victoria Bialas 03464b70cb changed `version 3` to `version 3.x` per Joffrey 2017-02-16 14:37:03 -08:00
John Mulhausen 989b3a7113 Update compose-versioning.md 2017-02-16 11:54:32 -08:00
Cedric Brancourt 0f4a08f916 fix(compose:extends): not supported from version 3 2017-02-16 19:39:23 +01:00
Tarun Chinmai 06583c91d9 Changed the `rails` command to `rake` 
changed `rails db:create` to `rake db:create`
 2017-02-15 22:14:18 +05:30
Devis Lucato 73662f59cb Fix broken links 
Fix the broken links at the bottom of https://docs.docker.com/compose/compose-file/ page
 2017-02-14 10:47:06 -08:00
Misty Stanley-Jones 404fa2295a Merge pull request #1608 from joaquincasares/patch-1 
Update index.md
 2017-02-13 16:51:44 -08:00
Misty Stanley-Jones 4e9553176f Merge pull request #1630 from ifraixedes/patch-1 
Fix yml file in compose alias example
 2017-02-13 16:44:07 -08:00
Misty Stanley-Jones 6cbbf69ca0 Merge pull request #1636 from shin-/v3-network-config 
Remove unsupported IPAM config entries in v3
 2017-02-13 16:41:58 -08:00
Josh Wyatt d5f60821fd Correct misspelling 2017-02-13 12:37:17 -08:00
Joffrey F 11f7db62e5 Remove unsupported IPAM config entries in v3 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-13 12:14:50 -08:00
Ivan Fraixedes e7f6f5ab36 Fix yml file in compose alias example 2017-02-13 16:21:37 +01:00
Joaquin Casares 483d318528 Update index.md 2017-02-10 19:16:53 -06:00
Victoria Bialas b9f6524a28 Merge pull request #1603 from londoncalling/compose-and-docker-run 
compose copyedit
 2017-02-10 14:54:31 -08:00
Victoria Bialas 1db710d8f3 compose copyedit 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-02-10 14:18:32 -08:00
John Mulhausen 9abc9e9f41 Add documentation for new top command (#1534) (#1601) 
Update command lists to include recent additions

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-10 13:59:06 -08:00
Victoria Bialas 19b5b6ad9e clarified getting started Compose topics based on user feedback 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-02-10 11:49:52 -08:00
Marko Schulz 107be08421 Small documentation fix 
There are four files (`Dockerfile`, `Gemfile`, `Gemfile.lock`, `docker-compose.yml`) described for the setup.
 2017-02-10 12:29:47 +01:00
Victoria Bialas b7dfc2921e re-wording, copy-edit 2017-02-09 22:43:37 -08:00
Victoria Bialas 2b7c238b0c copyedits and improvements to Compose reference 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-02-09 19:40:27 -08:00
Victoria Bialas 55b004036a added drafts of versioned compose reference files 
pruning Compose file v2 reference

updated Compose v1, v2, v3 files, still WIP

added includes for compatibility matrix, fixed TOC menu

new topic organziation Compose reference, split two 3 files plus versioning

Daniel's comments, fixed links, added more to versioning details

fixed volumes_from example per Daniel's comments for v1

simplified links to version references

copyedits and improved/surfaced links to versioning/upgrade docs

removed for version specific content re: volume_drivers from various files

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-02-09 17:39:08 -08:00
pedep be447bf1b5 Fix markdown rendering of example configuration (#1544) 
* fix code block formatting after list

add comment between code block and list to fix markdown rendering

* Update compose-file.md

* Update compose-file.md
 2017-02-08 15:49:14 -08:00
Juan Eugenio Abadie 91cc808b23 Fix link (#1392) 2017-01-26 14:12:28 -08:00
Michael Friis 2fb946b8f0 fix anchors (#1381) 
signed-off by Michael Friis <friism@gmail.com>
 2017-01-26 02:58:54 -08:00
Victoria Bialas bfbfbeeec5 added missing descriptions for update_config options 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-01-25 14:31:07 -08:00
Misty Stanley-Jones ef95a915eb Fixing broken links 
Formatting improvements along the way
 2017-01-25 11:51:14 -08:00
Juan Eugenio Abadie 2f472446a1 Add udp ports example (#1098) 2017-01-24 15:49:44 -08:00
Nick van der Meij bb81ccb937 Update envvars.md (#1008) 
* Update envvars.md

Update envvars.md to reflect the supported values of COMPOSE_CONVERT_WINDOWS_PATHS

* Update envvars.md
 2017-01-24 15:37:06 -08:00
Zhe Zhang cf42e71f2e update compose install to 1.10.0 (#1314) 2017-01-24 14:48:37 -08:00
Alex Urquhart 8b1117ad58 Update django.md 
Fixed typo
 2017-01-23 09:21:17 -05:00
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
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
John Mulhausen 83ec5da00d Merge pull request #196 from ezeeetm/patch-1 
update 'environment' to 'labels'
 2016-10-18 16:13:16 -07:00
Ivan Perez 3c41a34fd6 Typo in cd command 
Fixes typo in command.

(If you named your directory `my_wordpress`, then you should cd into `my_wordpress`, not `my-wordpress`)
 2016-10-18 20:44:36 +02:00
LRubin 3129564e3d Merge pull request #251 from liubin/master 
remove redundant back slash
 2016-10-18 11:37:04 -07:00
Misty Stanley-Jones 01910ab6d9 Update branding for macOS 
Apple has changed their branding guidelines from 'OS X' to 'macOS'
so we should update ours to be within trademark / branding
guidelines. See http://www.apple.com/macos/sierra/

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-10-18 09:21:09 -07:00
Bin Liu c8b449e7e0 remove redundant back slash 
I think this is a redundant back slash, should be removed.
 2016-10-18 22:31:25 +08:00