tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,839 Commits 25 Branches 263 Tags 66 MiB
Commit Graph

1839 Commits

Author SHA1 Message Date
Daniel Nephin f1e3c7b8b8 Merge pull request #2189 from mnowster/support-for-cgroup_parent 
Support for cgroup parent
 2015-10-14 10:59:04 -04:00
Mazz Mosley ca36628a0e Test cgroup_parent option is being sent. 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-14 15:02:42 +01: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
mnowster 26ff729696 Merge pull request #2164 from dnephin/rename_compose_reference 
Rename "yml reference" to "Compose file reference"
 2015-10-14 14:58:35 +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
mnowster bc82f065bc Merge pull request #1994 from charleswhchan/patch-3 
Touchup "Quickstart Guide: Compose and Django"
 2015-10-14 12:46:16 +01: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
Daniel Nephin c06d9ec672 Merge pull request #2179 from moxiegirl/retooling-hugo-15 
Updating to new tooling:supports Github source linking
 2015-10-13 18:12:56 -04: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
mnowster 129092b7b4 Merge pull request #2159 from dnephin/update_pip_install_docs 
Update pip install instructions to be more reliable
 2015-10-13 17:35:59 +01: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 0e9ec8aa74 Add publish to bintray step to appveyor.yml 
Remove Set-PSDebug -trace to prevent the 9000+ lines of debug output
from spamming the logs on appveyor.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-09 10:02:59 -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
mnowster 7538d7d258 Merge pull request #2152 from ronen/patch-1 
Bug fix: Use app's Gemfile.lock in Dockerfile
 2015-10-08 11:14:48 +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
Daniel Nephin 9ce1884925 Add upload to bintray from travis. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-07 14:54:05 -04:00
mnowster 7fe2068c9c Merge pull request #2150 from dnephin/fix_image_name_in_runsh 
Update release script and run.sh image name
 2015-10-07 16:38:45 +01:00
Daniel Nephin ad96e10938 Add travis.yml for building binaries. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-07 11:07:20 -04:00
Daniel Nephin 34f5912bbc Update release script and run.sh image name. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-07 11:00:40 -04: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
Daniel Nephin dbe311caaa Merge pull request #2149 from mnowster/2146-improve-bool-warning-message 
Improve boolean warning message.
 2015-10-07 10:23:58 -04:00
Mazz Mosley 8efc39e616 Improve boolean warning message. 
Including examples of more boolean types, eg yes/N as it's not
always immediately clear that they are treated as booleans.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-07 14:59:08 +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
Aanand Prasad 60c9225d22 Merge pull request #2140 from dnephin/fix_patch_stdout 
Reduce the scope of sys.stdout patching
 2015-10-07 11:43:25 +01:00
Mazz Mosley 21a1affc63 Re-word docs. 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-07 11:27:13 +01:00
Mazz Mosley f9028703f4 Pick the first container 
Rather than inefficiently looping through all the containers that a
service has and overriding each volumes_from value, pick the first
one and return that.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-07 11:27:13 +01:00
Mazz Mosley 0ff84a78c6 Use multiple returns rather than overriding. 
Also added a doc string for clarity.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-07 11:27:13 +01:00
Mazz Mosley 467c731869 address PR feedback 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-07 11:27:13 +01:00
Aanand Prasad fda615008c Merge pull request #2142 from dnephin/fix_error_cant_connect 
Fix error when compose can't connect to docker
 2015-10-07 11:22:32 +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
Aanand Prasad 807ab89750 Merge pull request #2144 from dnephin/remove_router_php 
Remove unnecessary router.php from wordpress example.
 2015-10-06 17:25:00 +01: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
Aanand Prasad 02a20c0373 Merge pull request #2069 from dnephin/test_against_latest_version_tags 
Test against a list of versions generated from docker/docker tags
 2015-10-06 16:33:15 +01:00
Aanand Prasad bf2faf6cdb Merge pull request #2132 from dnephin/fix_build_against_swarm 
Fix build against swarm
 2015-10-06 16:26:48 +01:00
Daniel Nephin 6edb6fa262 Test against a list of versions generated from docker/docker tags. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-06 10:51:52 -04:00
Daniel Nephin 15d0c60a73 Fix split buffer with inconsistently delimited json objects. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-06 10:43:07 -04:00
Daniel Nephin 3661e8bc74 Fix build against the swarm cluster by joining buffered output before parsing json. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-06 10:37:05 -04:00
Daniel Nephin fe65c0258d Remove unused attach_socket function from Container. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-06 10:37:05 -04:00