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

476 Commits

Author SHA1 Message Date
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 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 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 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 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
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
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
Aanand Prasad a20b84e6d2 Merge pull request #3178 from aanand/2774-off-one-offs 
Remove one-off containers in `rm` and `down`
 2016-03-22 10:12:21 +00:00
Daniel Nephin be1476f24b Only allow tmpfs on v2. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-21 14:41:28 -04:00
Joffrey F 5826a2147b Use enum to represent 3 possible states of the one_off filter 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-21 12:12:52 +00:00
Daniel Nephin 089ec66522 Include network settings as part of the service config hash. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-18 18:20:03 -04:00
Philip Walls 85c7d3e5ce Add support for docker run --tmpfs flag. 
Signed-off-by: Philip Walls <pawalls@rabidgeek.com>
 2016-03-18 18:19:48 -04:00
Thomas Grainger 20bf05a6e3 Fix TypeError in Exception handling 
Traceback (most recent call last):
  File "/tmp/tmp.02tgGaAGtW/docker-compose/bin/docker-compose", line 11, in <module>
    sys.exit(main())
  File "/tmp/tmp.02tgGaAGtW/docker-compose/lib/python3.4/site-packages/compose/cli/main.py", line 68, in main
    log_api_error(e)
  File "/tmp/tmp.02tgGaAGtW/docker-compose/lib/python3.4/site-packages/compose/cli/main.py", line 89, in log_api_error
    if 'client is newer than server' in e.explanation:
TypeError: 'str' does not support the buffer interface

Signed-off-by: Thomas Grainger <tagrain@gmail.com>
 2016-03-17 15:13:01 +00:00
Aanand Prasad 371ea479f5 Merge pull request #3075 from dnephin/reactive_logs 
Display logs for new containers started after the command is run
 2016-03-16 21:03:25 +00:00
Aanand Prasad abddabfb0a Merge pull request #3135 from dnephin/fix_down_idempotency 
Make down idempotent, continue to remove resources if one is missing
 2016-03-16 20:26:18 +00:00
Simon van der Veldt 658803edf8 Add -w or --workdir to compose run to override workdir from commandline 
Signed-off-by: Simon van der Veldt <simon.vanderveldt@gmail.com>
 2016-03-15 15:28:32 -04:00
Daniel Nephin e5529a89e1 Make down idempotent, continue to remove resources if one is missing. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-15 13:26:29 -04:00
Daniel Nephin e8a93821d4 Fix race condition where a container stopping and starting again would cause logs to miss logs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-15 13:17:11 -04:00
Daniel Nephin 48ed68eeaa Fix geneartors for python3. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-15 13:17:10 -04:00
Daniel Nephin 44c1747127 Add tests for reactive log printing. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-15 13:17:10 -04:00
Daniel Nephin 65797558f8 Refactor log printing to support containers that are started later. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-15 13:17:10 -04:00
Aanand Prasad e5cd869c61 Merge pull request #3095 from dnephin/refactor_command_dispatch 
Refactor command dispatch and fix api version mismatch error
 2016-03-14 16:18:29 +00:00
Daniel Nephin 0a091055d2 Improve handling of connection errors and error messages. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-08 15:39:11 -05:00
Daniel Nephin 886328640f Convert some cli tests to pytest. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-08 14:42:51 -05:00
Daniel Nephin 9f9dcc098a Make TopLevelCommand use the project field. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-08 14:36:53 -05:00
Daniel Nephin 53bea8a720 Refactor command dispatch to improve unit testing and support better error messages. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-08 14:23:27 -05:00
Dimitar Bonev 81b7fba33e Allowing null for build args 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2016-03-05 15:57:06 +02:00
Aanand Prasad 9e242cdc75 Merge pull request #3032 from dnephin/multiple_files_from_env_var 
Support multiple files in COMPOSE_FILE env var
 2016-03-03 17:23:22 +00:00
Aanand Prasad 4ae71f41dd Merge pull request #2832 from aanand/refactor-cli-unit-tests 
Refactor CLI initialization and unit tests
 2016-03-02 16:10:44 -08:00
Daniel Nephin 53a3d14046 Support multiple files in COMPOSE_FILE env var. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-02 18:47:58 -05:00
Aanand Prasad 20caf02bf6 Create real Project objects in CLI unit tests 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-02 15:11:34 -08:00
Aanand Prasad 4644f2c0f9 Remove environment-overriding unit test for 'run' 
There's already an acceptance test for it

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-02 15:11:32 -08:00
Aanand Prasad 575b48749d Remove unused global_options arg from dispatch() 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-02 15:09:48 -08:00
Aanand Prasad 2c75a8fdf5 Extract helper methods for building config objects from dicts 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-02 15:09:48 -08:00
Aanand Prasad f75408923e Merge pull request #3053 from dnephin/handle_booleans_in_mappings 
Don't allow booleans for mapping types
 2016-03-02 15:04:20 -08:00
Aanand Prasad 3f98c0716e Merge pull request #3052 from dnephin/merge_v1_logging 
Fix merging of logging options in v1 config
 2016-03-02 15:03:36 -08:00
Daniel Nephin e1b87d7be0 Update reference docs for the new flag. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-02 15:32:51 -05:00
Daniel Nephin b7fb3a6d9b Add --build flag for up and create 
Also adds a warning when up builds an image without the --build flag
so that users know it wont happen on the next up.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-02 15:32:51 -05:00
Stéphane Seguin 038da4eea3 Logs args of LogPrinter as a dictionary 
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2016-03-01 20:24:15 +01:00
Stéphane Seguin 9b36dc5c54 Add --tail flag as option on logs. 
Closes #265
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2016-03-01 20:23:46 +01:00
Stéphane Seguin 82632098a3 Add -f, --follow flag as option on logs. 
Closes #2187
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2016-03-01 20:23:43 +01:00
Daniel Nephin 18510b4024 Don't allow booleans for mapping types. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-01 11:57:35 -05:00
Daniel Nephin b726f508a6 Fix merging of logging options in v1 config. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-01 11:43:26 -05:00
Aanand Prasad adb8de367e Merge pull request #2388 from dnephin/fix_long_lines 
Wrap long lines
 2016-02-25 16:52:33 -08:00
Daniel Nephin dc3a5ce624 Refactor config validation to support constraints in the same jsonschema 
Reworked the two schema validation functions to read from the same schema but
use different parts of it. Error handling is now split as well by the
schema that is being used to validate.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-24 16:20:17 -08:00
Daniel Nephin d451578152 Make environment variables without a value the same as docker-cli. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 11:14:59 -08:00