tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,724 Commits 25 Branches 265 Tags 67 MiB
Commit Graph

2724 Commits

Author SHA1 Message Date
Tony Witherspoon 276738f733 Updated cli_test.py to validate against the updated help command conditions 
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
 2016-04-12 11:47:15 -04:00
Tony Witherspoon f5b80640fe Merge branch '3191_2_help_cli_feature' of https://github.com/twitherspoon/compose into 3191_2_help_cli_feature 2016-04-07 12:46:27 -04:00
twitherspoon 9f47e43b5c Merge branch 'master' into 3191_2_help_cli_feature 2016-04-07 12:43:34 -04:00
Tony Witherspoon 5d0aab4a8e updated cli_test.py to no longer expect raised SystemExit exceptions 
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
 2016-04-07 12:42:14 -04:00
Daniel Nephin 958f96c78a Merge pull request #3269 from dnephin/fix_logs_and_scale_down 
Prevent unnecessary inspection of containers
 2016-04-06 12:45:46 -04:00
Daniel Nephin b33d7b3dd8 Prevent unnecessary inspection of containers when created from an inspect. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-06 11:14:42 -04:00
Tony Witherspoon 129fb5b356 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-04-04 13:15:28 -04:00
Aanand Prasad 86530287d6 Merge pull request #2627 from bfirsh/update-roadmap 
Update roadmap
 2016-04-04 12:52:54 +01:00
Ben Firshman c1026e815a Update roadmap 
Bring it inline with current plans:

- Use in production is not necessarily about the command-line
  tool, but also improving file format, integrations, new tools,
  etc.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-04-01 12:55:16 -07:00
Ben Firshman c72d62f96d Merge pull request #3187 from bfirsh/update-wordpress-example-to-use-official-images 
Update wordpress example to use official images
 2016-04-01 20:53:37 +01:00
Daniel Nephin a63a05964b Merge pull request #3249 from aanand/better-env-substitution-example 
Better variable substitution example
 2016-04-01 15:12:18 -04:00
Joffrey F 9509508f3e Merge pull request #3226 from shin-/3210-assert-hostname 
Fix assert_hostname logic in tls_config_from_options
 2016-04-01 10:32:13 -07:00
Joffrey F 1a7a65f84d Include docker-py requirements fix 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-31 18:01:51 -07:00
Aanand Prasad 3034803258 Better variable substitution example 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-31 15:45:14 +01:00
Joffrey F 78a8be07ad Re-enabling assert_hostname when instantiating docker_client from the 
environment.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-30 11:11:19 -07:00
Joffrey F d27b82207c Remove obsolete assert_hostname tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-30 10:58:15 -07:00
Joffrey F 71c86acaa4 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-03-29 18:01:27 -07:00
Aanand Prasad 85e2fb63b3 Merge pull request #3218 from sdurrheimer/zsh-completion-run-workdir 
Add zsh completion for 'docker-compose run -w --workdir'
 2016-03-29 16:50:12 +01:00
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
Joffrey F 7116aefe43 Fix assert_hostname logic in tls_config_from_options 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-28 17:39:20 -07:00
Steve Durrheimer 8ae8f7ed4b Add zsh completion for 'docker-compose run -w --workdir' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-03-25 19:25:33 +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