tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-07 19:55:07 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,972 Commits 24 Branches 268 Tags
Commit Graph

1972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mazz Mosley
d6fa8596d2 Attach to a container's log_stream before they're started 
So we're not displaying output of all previous logs for a container, we attach,
if possible, to a container before the container is started.

LogPrinter checks if a container has a log_stream already attached and
print from that rather than always attempting to attach one itself.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-27 19:33:28 -04:00
Daniel Nephin
a9b4fe768d Fix running one-off containers with --x-networking by disabling linking to self. 
docker create fails if networking and links are used together.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-27 19:33:28 -04:00
Daniel Nephin
88e53e177d Upgrade pyinstaller to 3.0 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-26 13:05:41 -04:00
Daniel Nephin
e168fd03ca Fix unicode in environment variables for python2. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-26 13:05:41 -04:00
Daniel Nephin
95a23eb682 Change version check from engine version to api version. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-26 13:05:40 -04:00
Daniel Nephin
f5ad363143 Use inspect network to query for an existing network. 
And more tests for get_network()

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-26 13:05:40 -04:00
Daniel Nephin
f290faf4ba Minor refactor to use guard and replace instead of split+join 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-21 11:29:49 -04:00
Daniel Nephin
725088a18b Force windows drives to be lowercase. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-21 11:29:49 -04:00
Daniel Nephin
bf672ec340 Fixes #2205 - extends must be copied from override file. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-20 11:27:11 -04:00
Mazz Mosley
0e4f9c9a66 Environment keys can contain empty values 
Environment keys that contain no value, get populated with values taken
from the environment not from the build phase but from running the command `up`.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-19 15:16:19 -04:00
Mazz Mosley
5fdb75b541 Improve error message for type constraints 
It was missing a space between the different types, when there
were 3 possible type values.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-19 15:16:19 -04:00
Daniel Nephin
24d4a1045a Fixes #2203 - properly validate files when multiple files are used. 
Remove the single-use decorators so the functionality can be used directly as a function.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-19 15:16:19 -04:00
Daniel Nephin
514f0650b2 Give the user a better error message (without a stack trace) when there is a yaml error. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-19 12:02:40 -04:00
Steve Durrheimer
20d34c8b14 Add zsh completion for 'docker-compose --x-networking --x-network-driver' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-10-19 10:38:22 -04:00
Harald Albers
6f45eb7959 bash completion for networking options 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-10-19 10:11:35 -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
Cameron Eagans
6048630a11 docker-compose pull SERVICE should not pull SERVICE's dependencies 
Signed-off-by: Cameron Eagans <me@cweagans.net>
 2015-10-16 12:59:57 -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
Daniel Nephin
284cda087e Add missing merge for release branch. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-16 12:59:57 -04:00
Daniel Nephin
b2f9c182f3 Fix some release docs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-16 12:59:57 -04:00
Daniel Nephin
558098d322 Add a script to generate contributor list. 
Signed-off-by: Daniel Nephin <dnephin@docker.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
Tim Butler
49ca23c034 Fix link to Release Process doc in README.md 
Signed-off-by: Tim Butler <tim.butler.au@gmail.com>
 2015-10-16 12:59:57 -04:00
Daniel Nephin
709bd9c363 Bump 1.5.0rc1 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
1.5.0rc1 		2015-10-14 12:59:31 -04:00
Daniel Nephin
8cecf2e02d Merge remote-tracking branch 'docker/release' into bump-1.5.0rc1 2015-10-14 12:59:25 -04:00
Daniel Nephin
0409b287ad Merge pull request #2191 from dnephin/networking 
Networking
 2015-10-14 12:31:26 -04:00
mnowster
6b68a84b9b Merge pull request #2019 from mrfuxi/less-verbose-extends 
Allow to extend service using shorthand notation. Closes #1989
 2015-10-14 17:13:09 +01:00
Daniel Nephin
e2f792c4f4 If -x-networking is used, set the correct API version. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-14 12:09:50 -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
Daniel Nephin
f228173660 Print docker version. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-14 11:18:21 -04:00
Daniel Nephin
7c6e7e0dce Update docker-py to 1.5.0 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-14 11:18:21 -04:00
Daniel Nephin
b9c76dfabd Merge pull request #2181 from mnowster/2128-split-drive-not-handling-relative-paths 
2128 split drive not handling relative paths
 2015-10-14 11:04:42 -04:00
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
Karol Duleba
c7ffbf97c8 Extend oneOf error handling. Issue #1989 
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
 2015-10-14 14:31:35 +01: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
Mazz Mosley
c1d5ecaafe Workaround splitdrive limitations 
splitdrive doesn't handle relative paths, so if volume_path contains
a relative path, we handle that differently and manually set drive to ''.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-13 17:27:25 +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
Mazz Mosley
bc6b3f970b container paths don't need to be expanded 
They should not ever be relative.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-13 17:03:09 +01:00