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

3139 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Firshman
70a605acac Explain the explanation about file versions 
This explanation looked like it was part of the error. Added an
extra new line and a bit of copy to explain the explanation.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-05-04 11:52:56 -07:00
Ben Firshman
85b85bc675 Make validation error less robotic 
"ERROR: Validation failed in file './docker-compose.yml', reason(s):"

is now:

"ERROR: The Compose file './docker-compose.yml' is invalid because:"

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-05-04 11:52:56 -07:00
Patrice FERLET
b334b6f059 Fix the tests from jenkins 
Acceptance tests didn't set "help" command to return "0" EXIT_CODE.

close #3354
related #3263

Signed-off-by: Patrice Ferlet <metal3d@gmail.com>
 2016-05-04 11:52:56 -07:00
Joffrey F
0c1c338a02 Force docker-py 1.8.0 or above 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-04 11:52:56 -07:00
johnharris85
f655a8af95 Account for aliased links Fix failing tests Signed-off-by: John Harris <john@johnharris.io> 2016-05-04 11:52:56 -07:00
johnharris85
f7cd94d4a9 Adding tests Signed-off-by: John Harris <john@johnharris.io> 2016-05-04 11:52:56 -07:00
johnharris85
e4d2d7ed8a Config now catches undefined service links Fixes issue #2922 Signed-off-by: John Harris <john@johnharris.io> 2016-05-04 11:52:56 -07:00
Daniel Nephin
2a8c2c8ad6 Unit test for skipping network disconnect. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-05-04 11:52:56 -07:00
Daniel Nephin
5852db4d72 Set networking_config when creating a container. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-05-04 11:52:56 -07:00
Daniel Nephin
250a7a530b Only disconnect if we don't already have the short id alias. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-05-04 11:52:56 -07:00
johnharris85
4e8b017283 Fix CLI docstring to reflect Docopt behaviour. 
Signed-off-by: John Harris <john@johnharris.io>
 2016-05-04 11:52:56 -07:00
Vladimir Lagunov
a86a195c50 Fix #3248: Accidental config_hash change 
Signed-off-by: Vladimir Lagunov <lagunov.vladimir@gmail.com>
 2016-05-04 11:52:56 -07:00
Tony Witherspoon
3368887a29 Updated StringIO import to support io module 
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
 2016-05-04 11:52:56 -07:00
Tony Witherspoon
e5f1429ce1 Updated cli_test.py to validate against the updated help command conditions 
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
 2016-05-04 11:52:56 -07:00
Tony Witherspoon
65b0e5973b updated cli_test.py to no longer expect raised SystemExit exceptions 
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
 2016-05-04 11:52:56 -07:00
Tony Witherspoon
9cf483e224 Added code to output the top level command options if docker-compose help with no command options provided 
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
 2016-05-04 11:52:56 -07:00
Aanand Prasad
1e164ca802 Fix format of 'restart' option in 'config' output 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-05-04 11:52:56 -07:00
Aanand Prasad
a2ded237e4 Fix output of 'config' for v1 files 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-05-04 11:52:56 -07:00
Aanand Prasad
8a9ab69a1c Check full error message in test_up_with_net_is_invalid 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-05-04 11:52:56 -07:00
Aanand Prasad
9cfbfd55c4 Remove v2_only decorators on config tests 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-05-04 11:52:56 -07:00
Joffrey F
d41e6e00fa Merge remote-tracking branch 'source/release' into bump-1.7.1 2016-05-04 11:49:05 -07:00
Daniel Nephin
e8da6cb631 Merge pull request #3319 from docker/bump-1.7.0 
WIP: Bump 1.7.0
 2016-04-13 13:20:02 -04:00
Daniel Nephin
0d7bf73446 Bump 1.7.0 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
1.7.0 		2016-04-13 11:37:49 -04:00
Daniel Nephin
ea2d526246 Bump 1.7.0-rc2 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
1.7.0-rc2 		2016-04-11 13:26:16 -04:00
Aanand Prasad
2160c787e3 Fix race condition 
If processing of all objects finishes before the queue is drained,
parallel_execute_iter() returns prematurely.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-11 13:26:16 -04:00
Aanand Prasad
ebae76bee8 Rename a couple of functions in parallel.py 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-11 13:26:16 -04:00
Aanand Prasad
720dc893e2 Document parallel helper functions 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-11 13:26:16 -04:00
Aanand Prasad
d03f4e4b32 Small refactor to feed_queue() 
Put the event tuple into the results queue rather than yielding it from
the function.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-11 13:26:16 -04:00
Daniel Nephin
275b54641a Remove extra ensure_image_exists() which causes duplicate builds. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-08 15:52:33 -04:00
Aanand Prasad
68b4ef6cf2 Reduce queue timeout 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-08 15:52:33 -04:00
Aanand Prasad
de6496c6c9 Hold state in an object 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-08 15:52:33 -04:00
Aanand Prasad
79edda6804 Refactor so there's only one queue 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-08 15:52:33 -04:00
Aanand Prasad
a81b9dc6a0 Test events coming out of parallel_execute_stream in error case 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-08 15:52:33 -04:00
Aanand Prasad
868133e881 Extract get_deps test helper 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-08 15:52:33 -04:00
Aanand Prasad
d3899418b7 Move queue logic out of parallel_execute() 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-08 15:52:33 -04:00
Aanand Prasad
09e359fc8d Abort operations if their dependencies fail 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-08 15:52:33 -04:00
Aanand Prasad
cdef2b5e3b Refactor setup_queue() 
- Stop sharing set objects across threads
- Use a second queue to signal when producer threads are done
- Use a single consumer thread to check dependencies and kick off new
  producers

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-08 15:52:33 -04:00
Joffrey F
b865f35f17 Use docker-py 1.8.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-04-08 15:52:33 -04:00
Daniel Nephin
73d57a1acb Prevent unnecessary inspection of containers when created from an inspect. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-08 15:52:33 -04:00
Joffrey F
1dea8abe69 Include docker-py requirements fix 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-04-08 15:52:33 -04:00
Joffrey F
7dd29e8239 Re-enabling assert_hostname when instantiating docker_client from the environment. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-04-08 15:52:33 -04:00
Joffrey F
98d7a1e9dd Remove obsolete assert_hostname tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-04-08 15:52:33 -04:00
Joffrey F
a2adf31caa Update docker-py version to include match_hostname fix Removed unnecessary assert_hostname computation in tls_config_from_options 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-04-08 15:52:33 -04:00
Joffrey F
44715f18bd Fix assert_hostname logic in tls_config_from_options 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-04-08 15:52:33 -04:00
Steve Durrheimer
bd0f6d8d7b Add zsh completion for 'docker-compose run -w --workdir' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-04-08 15:52:33 -04:00
Steve Durrheimer
d434098b94 Add zsh completion for 'docker-compose up --build' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-04-08 15:52:33 -04:00
Steve Durrheimer
e863894e2d Add zsh completion for 'docker-compose logs -f --follow --tail -t --timestamps' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-04-08 15:52:33 -04:00
Steve Durrheimer
94afcfaf9d Add zsh completion for 'docker-compose exec' command 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-04-08 15:52:33 -04:00
Steve Durrheimer
c6c1afd568 Add zsh completion for 'docker-compose rm -a --all' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-04-08 15:52:33 -04:00
Daniel Nephin
1ad88662c0 Bump 1.7.0 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
1.7.0-rc1 		2016-03-24 14:31:37 -04:00