tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,027 Commits 20 Branches 267 Tags 58 MiB
Commit Graph

394 Commits

Author SHA1 Message Date
Daniel Nephin 77ff37a853 Bump 1.5.0 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 12:36:30 -05:00
Daniel Nephin 40341674bd Re-order extends docs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 12:36:30 -05:00
Daniel Nephin 62ebdce5a9 Replace composition with Compose app. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 12:36:30 -05:00
Daniel Nephin 58de4e0c26 Document using multiple Compose files use cases. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 12:36:30 -05:00
Daniel Nephin dbd6c62b70 Changes to production.md for working with multiple Compose files. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 12:36:30 -05:00
Daniel Nephin 887c6753f8 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 12:36:30 -05:00
Daniel Nephin bd35896892 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 12:36:30 -05:00
Daniel Nephin 83714fbac2 Touch up intro paragraph with feedback from @moxiegirl. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:33:23 -05:00
Daniel Nephin 413921a287 Add another feature to the docs - multiple environments per host. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:33:23 -05:00
Daniel Nephin 7ee36829ac Update intro docs based on feedback. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:33:23 -05:00
Daniel Nephin bfb46b37d3 Updates to gettingstarted guide from PR feedback. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:33:23 -05:00
Daniel Nephin 09d2bdbb21 Flush out features and use cases. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:33:23 -05:00
Daniel Nephin 8733d09a9c Extract the getting started guide from the index page. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:33:23 -05:00
Daniel Nephin e524cce222 Add missing title to compose file reference. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:33:23 -05:00
Daniel Nephin be6b811c4e Bump 1.5.0rc3 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-30 15:53:17 -04:00
Daniel Nephin d392f70cc6 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 15:36:15 -04:00
Mazz Mosley ab0ddb593f Clarify the command is an example 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-29 15:01:33 -04:00
Daniel Nephin ce729b0721 Update docs about networking for current release. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-29 15:01:33 -04:00
Daniel Nephin 8cc8e61474 Bump 1.5.0rc2 
Signed-off-by: Daniel Nephin <dnephin@docker.com>

Fill out 1.5.0 release notes

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-10-27 19:48:54 -04:00
Sven Dowideit 29b0ffe5e9 Possible link fixes 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-10-27 19:33:28 -04:00
Mazz Mosley 49b98fa111 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:52:32 -04:00
Aanand Prasad 46de4411a7 Revert networking-related changes to getting started guides 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-10-16 12:59:57 -04:00
Karol Duleba 883f251e7d Docs for shorthand notation of extends. Issue #1989 
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
 2015-10-16 12:59:57 -04:00
Per Persson 6571e079b9 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-16 12:59:57 -04:00
Daniel Nephin 709bd9c363 Bump 1.5.0rc1 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-14 12:59:31 -04: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
Daniel Nephin 6e838b5de1 Add link to master builds from install docs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-09 10:03:44 -04:00
Daniel Nephin 94e6727831 Re-order docs Makefile for better caching. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-08 19:12:02 -04:00
Daniel Nephin 5fbde6106e Merge pull request #2157 from mnowster/2151-missing-port-range 
Put port ranges back in
 2015-10-08 10:22:33 -04:00
Mazz Mosley a3eb563f94 Put port ranges back in 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-08 11:50:27 +01:00
ronen barzel 23fcace36c Bug fix: Use app's Gemfile.lock in Dockerfile 
The Dockerfile should use the same Gemfile.lock as the app, to make sure the container gets the expected versions of gems installed.  Aside from wanting that in principle, without it you can get mysterious gem dependency errors.  Here's the scenario:

1. Suppose `Gemfile` includes `gem "some-active-gem", "~> 1.0"
2. When developing the app, you run `bundle install`, which installs the latest version--let's say, 1.0.1-and records it in `Gemfile.lock`
3. Suppose the developers of `some-active-gem` then release v1.0.2
4. Now build the container: docker runs `bundle install`, which installs v1.0.2 and records it in `Gemfile.lock` and then "ADD"s the app worktree, which replaces the `Gemfile.lock` with the one from the worktree that lists v1.0.1.
5. Immediately run your app and it fails with the error `Could not find some-active-gem-1.0.1 in any of the sources` which is a bit befuddling since you just saw it run bundle install so you expect all gem dependencies to be resolved properly.

Signed-off-by: ronen barzel <ronen@barzel.org>
 2015-10-08 03:08:50 +01:00
mnowster c8cd618df9 Merge pull request #2145 from dnephin/update_release_scripts 
Update release scripts for release image
 2015-10-07 15:51:04 +01:00
Aanand Prasad 627f1acdc4 Merge pull request #2126 from mnowster/1188-support-ro-options-in-volumes-from 
1188 support ro options in volumes from
 2015-10-07 11:57:14 +01:00
Mazz Mosley 21a1affc63 Re-word docs. 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-07 11:27:13 +01:00
Daniel Nephin 4ae2a0e610 Update release scripts for release image. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-06 15:21:34 -04:00
Daniel Nephin 97dc4895ac Remove unnecessary router.php from wordpress example. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-06 11:37:36 -04:00