Commit Graph

404 Commits

Author SHA1 Message Date
Daniel Nephin 6e89a5708f cherry-pick release notes from 1.5.1
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-24 13:24:46 -05:00
Daniel Nephin 3fdf0f43be Add note about required pip version.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-19 12:55:03 -05:00
Sven Dowideit acf31181e8 Some small changes to clear up docs-validation complaints
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-11-19 13:35:09 +10:00
Daniel Nephin 7365a398b3 Update doc wording for ulimits.
and move tests to the correct module

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-10 15:03:20 -05:00
Kevin Greene 22d90d2180 Added ulimits functionality to docker compose
Signed-off-by: Kevin Greene <kevin@spantree.net>
2015-11-10 14:07:04 -05:00
Adrian Budau c5c36d8b00 Added --force-rm to compose build.
It's a flag passed to docker build that removes the intermediate
containers left behind on fail builds.

Signed-off-by: Adrian Budau <budau.adi@gmail.com>
2015-11-10 13:05:04 -05:00
Daniel Nephin 6b002fb922 Cherry-pick release notes froim 1.5.0
And bump version to 1.6.0dev

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-05 10:25:46 -05:00
Daniel Nephin e503e085ac Re-order extends docs.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-03 11:52:44 -05:00
Daniel Nephin 8bdde9a731 Replace composition with Compose app.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-03 11:28:51 -05:00
Daniel Nephin eab265befa Document using multiple Compose files use cases.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-03 11:28:51 -05:00
Daniel Nephin c5cf5cfad4 Changes to production.md for working with multiple Compose files.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-03 11:28:51 -05:00
Daniel Nephin 1c4c7ccfac Support a volume to the docs directory and add --watch, so docs can be refreshed.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-03 11:28:51 -05:00
Daniel Nephin 7014cabb04 Remove duplication from extends docs.
Start restructuring extends docs in preparation for adding documentation about using multiple compose files.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-03 11:28:51 -05:00
Daniel Nephin c58cf036e3 Touch up intro paragraph with feedback from @moxiegirl.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-02 15:16:23 -05:00
Daniel Nephin a3fb13e141 Add another feature to the docs - multiple environments per host.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-02 15:16:23 -05:00
Daniel Nephin d9bc91b7cc Update intro docs based on feedback.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-02 15:16:23 -05:00
Daniel Nephin db3b90b84e Updates to gettingstarted guide from PR feedback.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-02 15:16:23 -05:00
Daniel Nephin 86d845fde3 Flush out features and use cases.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-02 15:16:23 -05:00
Daniel Nephin 186d43c59f Extract the getting started guide from the index page.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-02 15:16:23 -05:00
Daniel Nephin 53a0de7cf2 Add missing title to compose file reference.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-11-02 15:16:23 -05:00
Daniel Nephin c7d164d01c Fixes #1843, #1936 - chown files back to host user in django example.
Also add a missing 'touch Gemfile.lock' to fix the rails tutorial.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-30 12:42:15 -04:00
Mazz Mosley 983dc12160 Clarify the command is an example
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-29 16:52:00 +00:00
mnowster 6cd9bab35b Merge pull request #2276 from dnephin/update_networking_docs
Update docs about networking for current release
2015-10-29 15:19:02 +00:00
mnowster 3a2df57f3d Merge pull request #2273 from mnowster/cross-ref-docs
Add cross references for env/cli
2015-10-29 12:04:10 +00:00
Daniel Nephin 0ef3b47f74 Update docs about networking for current release.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-28 15:17:11 -04:00
Mazz Mosley e13b8949b0 Add cross references for env/cli
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-28 17:42:30 +00:00
Mazz Mosley c341860d11 Clarify `dockerfile` requires `build` key
Credit to @funkyfuture for the first PR addressing the clarification.
https://github.com/docker/compose/pull/1767

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-28 17:27:38 +00:00
Sven Dowideit cf197253cd Possible link fixes
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-10-23 09:00:08 +10:00
Daniel Nephin ae3c66baed Merge pull request #2204 from mnowster/2123-escaping-env-variables
Attempt to document escaping env vars
2015-10-16 15:51:58 -04:00
mnowster a712d828d4 Merge pull request #2200 from aanand/revert-tutorials
Revert networking-related changes to getting started guides
2015-10-16 17:06:31 +01:00
Mazz Mosley 7b109bc026 Attempt to document escaping env vars
People are likely to run into their env vars being set to empty strings,
if they're not aware that they need to escape them for Compose to not
interpolate them.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-16 15:32:02 +01:00
mnowster b0c895c5f5 Merge pull request #2193 from mrfuxi/less-verbose-extends-docs
Docs for shorthand notation of extends. Issue #1989
2015-10-16 10:25:10 +01:00
Aanand Prasad 1ed23fb2de Revert networking-related changes to getting started guides
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-10-16 11:58:27 +05:30
Karol Duleba ccfb6e6fa8 Docs for shorthand notation of extends. Issue #1989
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
2015-10-15 22:17:13 +01:00
Per Persson c6ff81fe30 Remove incorrectly placed comment
I'm not sure if it should be there at all, but at least it should hardly be where it currently is located.

Signed-off-by: Per Persson <per.persson@exertisztorm.com>
2015-10-15 15:25:52 +02:00
Aanand Prasad d5f5eb1924 Enable use of Docker networking with the --x-networking flag
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-10-14 11:19:43 -04:00
Mohit Soni f4efa29377 Added support for cgroup_parent
This change adds cgroup-parent support to compose project. It allows
each service to specify a 'cgroup_parent' option.

Signed-off-by: Mohit Soni <mosoni@paypal.com>
2015-10-14 15:02:42 +01:00
Daniel Nephin fbfbe60246 Rename yml.md to compose-file.md and add an alias for the old url.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 09:51:34 -04:00
Daniel Nephin 01f44efe0d Re-arrange volume_driver in compose file reference.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 09:50:37 -04:00
Daniel Nephin e6344f819a Rename yaml reference to compose file reference.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-14 09:50:37 -04:00
Charles Chan 5fa5ea0e16 Touchup "Quickstart Guide: Compose and Django"
Also incorporated the structural changes by @moxiegirl in PR #1994 as well as subsequent issues reported by @aanand.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-10-13 20:10:41 -07:00
Mary Anthony e9ee244e5a Aaaaaaaaaaaargh
Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-13 15:06:37 -07:00
Mary Anthony 0e9c542865 Updating to new tooling:supports Github source linking
Fixing HEAD
Updating to match daniel
Fixing the index link

Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-13 14:04:25 -07:00
Daniel Nephin 9aaecf95a4 Update pip install instructions to be more reliable.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-13 12:25:06 -04:00
mnowster 4b845746ef Merge pull request #2154 from dnephin/publish_master_builds
Publish master builds to bintray
2015-10-13 14:50:25 +01:00
mnowster 928300478b Merge pull request #2162 from dnephin/docs_cleanup_and_fixes
Docs changes, fixed some links, removed older links, etc
2015-10-13 14:25:33 +01:00
Daniel Nephin 9b9c8f9cbc Clarify irc details, and remove "infancy" statement.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-09 11:14:21 -04:00
Daniel Nephin e90d2b418d Update title for command-line completion docs.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-09 11:14:21 -04:00
Daniel Nephin 182c2537d0 Fix links between reference sections
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-09 11:14:21 -04:00
Daniel Nephin cd48a7026a Cleanup doc reference links.
Removed 'Compose command line completion' and 'Compose environment variables' from the list. command line completion is linked to from install docs, and environment variables are deprecated.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-09 11:13:24 -04:00