tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-24 22:24:41 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,617 Commits 21 Branches 282 Tags
Commit Graph

2617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Nephin
cf40a38820 Merge pull request #2237 from dnephin/env_ci_storage_graph 
Make storage driver configurable in CI
 2015-10-21 16:29:40 -04:00
Daniel Nephin
f7100b2ef3 Change version check from engine version to api version. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-21 15:40:50 -04:00
Daniel Nephin
1bc3c97f2a Make storage driver configurable in CI 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-21 15:26:44 -04:00
Daniel Nephin
0fed5e6864 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-21 13:05:14 -04:00
mnowster
c34a9f165d Merge pull request #2207 from dnephin/make_config_loader_immutable 
Refactor of ServiceLoader to make it immutable
 2015-10-21 17:14:40 +01: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
b500fa2351 Refactor ServiceLoader to be immutable. 
Mutable objects are harder to debug and harder to reason about. ServiceLoader was almost immutable. There was just a single function which set fields for a second function. Instead of mutating the object, we can pass those values as parameters to the next function.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-21 11:14:35 -04:00
Daniel Nephin
4505632274 Some minor style cleanup 
- fixed a docstring to make it PEP257 compliant
- wrapped some long lines
- used a more specific error

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-21 11:13:00 -04:00
mnowster
fb69391889 Merge pull request #2233 from dnephin/some_unit_test_cleanup 
Cleanup some unit tests and whitespace
 2015-10-21 10:39:28 +01:00
mnowster
44e1fc3a32 Merge pull request #2230 from dnephin/lowercase_windows_drive 
Lowercase windows drive letter
 2015-10-21 10:36:46 +01:00
Daniel Nephin
b1f8ed84a3 Cleanup some unit tests and whitespace. 
Remove some unnecessary newlines.
Remove a unittest that was attempting to test behaviour that was removed a while ago, so isn't testing anything.
Updated some unit tests to use mocks instead of a custom fake.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-20 14:23:56 -04:00
Daniel Nephin
5523c3d745 Minor refactor to use guard and replace instead of split+join 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-20 12:09:01 -04:00
Daniel Nephin
3f0e083585 Force windows drives to be lowercase. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-20 11:39:06 -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
mnowster
5ed9f9bdf7 Merge pull request #2206 from dnephin/fix_extends_from_second_file 
extends must be copied from override file
 2015-10-20 10:22:58 +01: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
3725c3ab7e Merge pull request #2225 from mnowster/2221-blank-env-vars 
2221 allow empty environment keys
 2015-10-19 14:06:31 -04:00
Daniel Nephin
938d49cbdc Fixes #2205 - extends must be copied from override file. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-19 13:41:58 -04:00
mnowster
f1f3acd070 Merge pull request #2210 from dnephin/fix_empty_override 
Properly validate files when multiple files are used
 2015-10-19 18:32:48 +01:00
Daniel Nephin
937e087c6c 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 12:39:45 -04:00
Daniel Nephin
cd0b63879b Merge pull request #2208 from dnephin/another_release_script_fix 
Fix check for tags in release script `make-branch`
 2015-10-19 12:34:25 -04:00
Daniel Nephin
129e2f9482 Fix check for tags. 
If there is a branch with the same name as a tag it fails without the
--tags. This was only a problem when we're branching from a git tag.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-19 12:33:25 -04:00
mnowster
a75bdfe11c Merge pull request #2220 from ticosax/trove-classifire 
Add trove classifier to declare supported python versions.
 2015-10-19 17:20:31 +01: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
Mazz Mosley
08add665e9 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 16:32:12 +01:00
mnowster
159cddf563 Merge pull request #2209 from dnephin/fix_error_on_invalid_yaml 
Give the user a better error message when the yaml file is invalid
 2015-10-19 16:29:36 +01: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
Daniel Nephin
076b5bc31c Merge pull request #2197 from sdurrheimer/zsh-completion-network-options 
Add zsh completion for 'docker-compose --x-networking --x-network-dri…
 2015-10-19 10:37:57 -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
ff83c459d0 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 14:36:56 +01:00
Corin Lawson
4d8e667c3e Powershell script to run compose in a container. 
This script assumes the typical environment that Windows users operate,
namely, VirtualBox running the boot2docker ISO, managed by
docker-machine. I wrote this script for my Windows using colleagues and
first placed it in the public domain as a gist:
https://gist.github.com/au-phiware/25213e72c80040f398ba
In short, that script works for me.

I have adapted that script to use the (yet to be) official image
(docker/compose:latest) and also added an extra environment variable to
provide additional options to docker run.

Signed-off-by: Corin Lawson <corin@phiware.com.au>
 2015-10-19 22:32:35 +11:00
mnowster
1a97a8ef86 Merge pull request #2213 from viranch/trim-dockerfile 
Trim Dockerfile
 2015-10-19 12:08:20 +01:00
Steve Durrheimer
ac06366ef9 Add zsh completion for 'docker-compose --x-networking --x-network-driver' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-10-19 12:31:17 +02:00
mnowster
bca018c50a Merge pull request #2211 from albers/completion-networking 
bash completion for networking options
 2015-10-19 11:23:03 +01:00
mnowster
2516aa8e08 Merge pull request #2212 from albers/completion-nospace 
fix problem with bash completion in old bash
 2015-10-19 11:22:44 +01:00
Nicolas Delaby
37921b40dd Add trove classifier to declare supported python versions. 
Signed-off-by: Nicolas Delaby <nicolas.delaby@lock8.me>
 2015-10-19 10:52:39 +02:00
Viranch Mehta
07e9f6500c Pipe curl's download directly to extract/execute program to reduce number of commands 
Signed-off-by: Viranch Mehta <viranch.mehta@gmail.com>
 2015-10-18 01:06:50 +05:30
Viranch Mehta
258c8bc54d Fix specifies_host_port() to handle port binding with host IP but no host port 
Signed-off-by: Viranch Mehta <viranch.mehta@gmail.com>
 2015-10-18 00:40:51 +05:30
Harald Albers
fa44a5fac2 fix problem with bash completion in old bash 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-10-17 09:51:37 -07:00
Harald Albers
43a89e1702 bash completion for networking options 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-10-17 09:30:53 -07: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
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
Daniel Nephin
26dc0b785b 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-16 15:05:06 -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