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
2,703 Commits 24 Branches 268 Tags
Commit Graph

2703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aanand Prasad
024a810617 Merge pull request #3217 from sdurrheimer/zsh-completion-up-build 
Add zsh completion for 'docker-compose up --build'
 2016-03-29 16:49:49 +01:00
Aanand Prasad
668d45c7cc Merge pull request #3216 from sdurrheimer/zsh-completion-logs 
Add zsh completion for 'docker-compose logs -f --follow --tail -t --t…
 2016-03-29 16:49:36 +01:00
Aanand Prasad
09ea74245d Merge pull request #3215 from sdurrheimer/zsh-completion-exec-command 
Add zsh completion for 'docker-compose exec' command
 2016-03-29 16:49:15 +01:00
Aanand Prasad
386edd892c Merge pull request #3214 from sdurrheimer/zsh-completion-rm-all 
Add zsh completion for 'docker-compose rm -a --all'
 2016-03-29 16:48:53 +01:00
Steve Durrheimer
9729c0d3c7 Add zsh completion for 'docker-compose up --build' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-03-25 19:15:34 +01:00
Steve Durrheimer
9d58b19ecc Add zsh completion for 'docker-compose logs -f --follow --tail -t --timestamps' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-03-25 19:09:53 +01:00
Steve Durrheimer
63b448120a Add zsh completion for 'docker-compose exec' command 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-03-25 19:03:36 +01:00
Steve Durrheimer
0f1fb42326 Add zsh completion for 'docker-compose rm -a --all' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-03-25 18:52:28 +01: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
Harald Albers
5416e4c99b bash completion for docker-compose up --build 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-03-24 17:21:56 +01:00
Harald Albers
d8fb9d8831 bash completion for new docker logs options 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-03-24 17:11:10 +01:00
Aanand Prasad
2b063d332e Merge pull request #3196 from albers/completion-daemon-options 
bash completion for new TLS options
 2016-03-24 15:11:55 +00:00
Daniel Nephin
b09b6e390f Merge pull request #3199 from aanand/add-tls-flags-to-overview 
Add TLS flags to CLI reference
 2016-03-24 10:48:50 -04:00
Aanand Prasad
8282bb1b24 Add TLS flags to CLI reference 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-24 14:41:51 +00:00
Harald Albers
5b2c2e332f bash completion for TLS options 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-03-24 12:06:10 +01:00
Harald Albers
9094c4d97d prepare bash completion for new TLS options 
Up to now there were two special top-level options that required special
treatment: --project-name and --file (and their short forms).
For 1.7.0, several TLS related options were added that have to be passed
to secondary docker-compose invocations as well.
This commit introduces a scalable treatment of those options.

Signed-off-by: Harald Albers <github@albersweb.de>
 2016-03-24 12:05:59 +01:00
Victoria
2a09fb02db Merge pull request #3182 from londoncalling/docs-fix-links-build-errors 
fixed links showing as build errors per PR #3180
 2016-03-23 15:08:25 -07:00
Victoria Bialas
d1ea4d72ac fixed links showing as build errors per PR #3180 
fixed links per build errors

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-03-23 14:58:45 -07:00
Aanand Prasad
c3eca82749 Merge pull request #3128 from dnephin/add_network_settings_to_config_hash 
Include network settings as part of the service config hash.
 2016-03-23 17:01:32 +00:00
Daniel Nephin
2be2029791 Merge pull request #3139 from shin-/1716-tls-flags-support 
Add support for TLS config command-line options
 2016-03-22 18:24:52 -04:00
Joffrey F
2cc87555cb tls_config_from_options unit tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-22 11:57:45 -07:00
Joffrey F
4727115317 Bump docker-py version to include tcp host fix 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-22 11:47:53 -07:00
Joffrey F
442dff72b4 Improve assert_hostname setting in tls_config_from_options 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-22 11:47:53 -07:00
Joffrey F
26f3861791 Specifying --tls no longer overrides all other TLS options 
Add an option to skip hostname verification

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-22 11:47:53 -07:00