tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,111 Commits 20 Branches 267 Tags 56 MiB
Commit Graph

3111 Commits

Author SHA1 Message Date
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>
 2016-03-24 14:31:37 -04:00
Daniel Nephin 827573a594 Merge remote-tracking branch 'docker/release' into bump-1.7.0 2016-03-24 14:31:17 -04:00
Daniel Nephin aa50023507 Merge pull request #3057 from shin-/2636-env-file 
Add support for a default environment file
 2016-03-24 14:26:03 -04:00
Joffrey F 12ad3ff301 Injecting os.environ in Environment instance happens outside of init method 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:28 -07:00
Joffrey F 1506f997de Better windows support for Environment class 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:28 -07:00
Joffrey F b99037b4a6 Add support for DOCKER_* variables in .env file 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:28 -07:00
Joffrey F c7afe16419 Account for case-insensitive env on windows platform 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Joffrey F 36f1b4589c Limit occurrences of creating an environment object. 
.env file is always read from the project_dir

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Joffrey F 0ff53d9668 Less verbose environment invocation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Joffrey F dcdcf4869b Mention environment file in envvars.md 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Joffrey F 21aa7a0448 Documentation for .env file 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Joffrey F f48da96e8b Test get_project_name from env file 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Joffrey F d55fc85fea Added default env file test. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Joffrey F 1801f83bb8 Environment class cleanup 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Joffrey F fd020ed2cf Tests use updated get_config_paths_from_options signature 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Joffrey F 5831b869e8 Update tests for new environment handling 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Joffrey F b9ca5188a2 Remove Environment singleton, instead carry instance during config processing 
Project name and compose file detection also updated

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Joffrey F bf8e501b5e Fix pre-commit config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Joffrey F c69d8a3bd2 Implement environment singleton to be accessed throughout the code 
Load and parse environment file from working dir

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Daniel Nephin d1d8df7f72 Merge pull request #3192 from shin-/use-dockerpy-1.8 
Require docker-py 1.8.0rc2
 2016-03-24 13:55:59 -04:00
Joffrey F d78b013bb0 Merge pull request #3204 from albers/completion-rm--all 
bash completion for `docker-compose rm --all`
 2016-03-24 10:44:36 -07:00
Joffrey F aabeb56527 Merge pull request #3206 from albers/completion-exec 
bash completion for `docker-compose exec`
 2016-03-24 10:44:19 -07:00
Joffrey F 60470fb9f1 Require docker-py 1.8.0rc2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:13:56 -07:00
Daniel Nephin 84a2e634a8 Merge pull request #3200 from dnephin/disable_broken_test 
Disable a test that is failing against 1.11.0rc1.
 2016-03-24 13:09:35 -04:00
Harald Albers c9b02b7b34 bash completion for `docker-compose exec` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-03-24 18:02:12 +01:00
Joffrey F 87231a25be Merge pull request #3202 from albers/completion-logs 
bash completion for new `docker logs` options
 2016-03-24 09:56:12 -07:00
Joffrey F 353c4deb19 Merge pull request #3203 from albers/completion-up--build 
bash completion for `docker-compose up --build`
 2016-03-24 09:55:58 -07:00
Daniel Nephin 732531b722 Disable a test that is failing against 1.11.0rc1. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-24 12:32:13 -04:00
Harald Albers b030c3928a bash completion for `docker-compose rm --all` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-03-24 17:29:04 +01:00