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

2587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mazz Mosley
30a84f1be6 Move rename functionality into Container 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-27 17:12:18 +00:00
Mazz Mosley
bee063c07d Fix tests 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-27 17:12:18 +00:00
Mazz Mosley
7603ebea9b 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 17:12:18 +00:00
mnowster
ffa2b08dbb Merge pull request #2258 from dnephin/dont_link_when_using_networking 
Fix running one-off containers with --x-networking
 2015-10-27 15:32:20 +00:00
Daniel Nephin
7878d38dee 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 11:11:15 -04:00
mnowster
a4b002a76e Merge pull request #2257 from mnowster/2226-additional-classifiers 
Include additional classifiers
 2015-10-27 11:12:38 +00:00
Mazz Mosley
fe760a7b62 Include additional classifiers 
I've included Python 2/3 as they are not parent classifiers but
sibling classifiers. They denote that this project will work with
*some* versions of python and by having them, they'll show up for
people searching for python 2 or 3 projects.

According to the internet :)

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-26 17:08:45 +00: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
mnowster
f3d49e38c0 Merge pull request #2245 from dnephin/upgrade_to_pyinstaller_3 
Upgrade to pyinstaller 3
 2015-10-26 11:54:02 +00:00
Daniel Nephin
0340361f56 Upgrade pyinstaller to 3.0 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-23 13:34:49 -04:00
mnowster
986036b6f9 Merge pull request #2223 from au-phiware/master 
Powershell script to run compose in a container.
 2015-10-23 18:10:18 +01:00
mnowster
5d60fbe31e Merge pull request #1659 from viranch/hostip-random-port 
Allow scaling services that have port binding of the form `host_ip::container_port`
 2015-10-23 17:11:28 +01:00
mnowster
e6f3946c17 Merge pull request #2239 from dnephin/fix_unicode_in_env 
Fix unicode in environment variables for python2
 2015-10-23 11:03:59 +01:00
moxiegirl
e2af02b158 Merge pull request #2238 from SvenDowideit/possible-link-fixes 
Possible link fixes
 2015-10-22 16:27:44 -07: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
ae47435425 Fix unicode in environment variables for python2. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-22 12:12:43 -04:00
mnowster
6f78271b82 Merge pull request #2236 from dnephin/use_inspect_network 
Use inspect network to query for an existing network
 2015-10-22 13:37:27 +01:00
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