tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,863 Commits 21 Branches 266 Tags 54 MiB
Commit Graph

53 Commits

Author SHA1 Message Date
Tony Witherspoon ae46bf8907 Updated StringIO import to support io module 
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
 2016-04-12 12:29:59 -04:00
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
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
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 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
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 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
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
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
Aanand Prasad be236d8801 Update docker-py and dockerpty 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-04 19:16:01 +00:00
Dimitar Bonev 34ccb90d7e Falling back to default project name when COMPOSE_PROJECT_NAME is set to empty 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2016-01-30 10:14:45 +02:00
Aanand Prasad da2b6329ae Add test for logs=False 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

Conflicts:
	compose/cli/main.py
 2016-01-21 19:20:50 +00:00
Aanand Prasad f3e55568d1 Fix interactive run with networking 
Make sure we connect the container to all required networks *after*
starting the container and *before* hijacking the terminal.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-21 18:42:59 +00:00
Daniel Nephin 2acc29cf1c Remove support for fig.yaml, FIG_FILE, and FIG_PROJECT_NAME. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-04 15:37:21 -05:00
Aanand Prasad ecf2dd11f9 Merge pull request #2467 from dnephin/remove_migrate_to_labels 
Remove migrate-to-labels.
 2015-12-07 14:31:23 +00:00
Daniel Nephin a21f9993b3 Remove migrate-to-labels. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-27 12:04:45 -05:00
Daniel Nephin 2f568984f7 Fixes #2368, removes the deprecated --allow-insecure-ssl flag. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-27 11:52:25 -05:00
Daniel Nephin 12b82a20ff Move restart spec to the config.types module. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-23 13:31:58 -05:00
Daniel Nephin ae47435425 Fix unicode in environment variables for python2. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-22 12:12:43 -04:00
Daniel Nephin 78c0734cbd Disable some tests in windows for now. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-23 10:42:57 -04:00
Daniel Nephin 258d0fa0c6 Remove some functions from Command class 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:13:50 -04:00
Mazz Mosley 39ba2c5a7c Fix leaky tests 
It was mocking self.client but relying on the call to
utils.create_host_config which was not mocked. So now that function
has moved to also be on self.client we need to redefine the test
boundary, up to where we would call docker-py, not the result of
docker-py.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-09-17 17:11:00 +01:00
Daniel Nephin d2718bed99 Allow setting a one-off container name 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-26 13:33:03 -04:00
Daniel Nephin 809443d6d0 Support python 3 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 10:37:29 -04:00
Daniel Nephin 59d4f304ee Run pre-commit on all files 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-24 17:04:50 -04:00
Karol Duleba ff87ceabbd Allow manual port mapping when using "run" command. Fixes #1709 
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
 2015-08-12 18:54:42 +01:00
Aanand Prasad 233c509f71 Remove logging test 
It doesn't do much other than cause the remainder of the test suite to
generate lots of junk output.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-21 15:56:37 +01:00
Aanand Prasad e98caf5cf9 Show an error on 'run' when there are legacy one-off containers 
Also warn the user about the one-off containers in the standard error
message about legacy containers.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-07-06 14:45:17 +01:00
Daniel Nephin ae96fc0071 Support reading config from stdin. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-07-02 22:16:22 -04:00
Aanand Prasad 93372dd665 Fix 'docker-compose help migrate-to-labels' 
- Fix "No such command" error

- Add text from migration section of install docs

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-19 15:43:53 -07:00
Daniel Nephin 89789c54ad Merge pull request #1232 from aleksandr-vin/add-parent-directories-search-for-default-compose-files 
Add parent directories search for default compose-files
 2015-04-24 13:12:24 -04:00
Aleksandr Vinokurov ceff5cb9ca Add parent directories search for default compose-files 
Does not change directory to the parent with the compose-file found.
Works like passing '--file' or setting 'COMPOSE_FILE' with absolute path.
Resolves issue #946.

Signed-off-by: Aleksandr Vinokurov <aleksandr.vin@gmail.com>
 2015-04-09 22:36:47 +00:00
Joseph Page 0b48e137e8 add unit tests for run --rm with restart 
Signed-off-by: Joseph Page <joseph.page@rednet.io>
 2015-04-07 10:18:25 +02:00
akoskaaa fa2fb6bd38 [pep8] flake8 run for everything, fix items from this change 
Signed-off-by: akoskaaa <akos.hochrein@prezi.com>
 2015-03-25 23:15:34 -07:00
akoskaaa f9ea5ecf40 [pep8] make test files and config files pep8 valid 
Signed-off-by: akoskaaa <akos.hochrein@prezi.com>
 2015-03-25 20:20:38 -07:00
Ian VanSchooten 86b723e227 Provide user override option on command line 
Allows overriding a user on the command line from the one specified in
the docker-compose.yml

The added tests verify that a specified user overrides a default
user in the docker-compose.yml file.

Based on commit f2f01e207b by @chmouel

Signed-off-by: Ian VanSchooten <ian@badgelabsllc.com>
 2015-03-11 00:11:31 -04:00
Daniel Nephin f47431d591 Resolves #927 - fix merging command line environment with a list in the config 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-03-02 10:23:43 -05:00
Aanand Prasad 7c087f1c07 Support fig.y(a)ml and show a deprecation warning 
Closes #864

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-29 13:14:44 -05:00
Aanand Prasad 9bc7604e0e Make sure we're testing uppercase directories properly 
(OS X is case-sensitive so we can't have fixture dirs which are
identically named if you ignore case)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-28 17:19:27 -05:00
Aanand Prasad 2af7693e64 WIP: rename Fig to Compose 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:00:23 +00:00
Gabor Nagy c838f7da18 Convert project_name to lowercase 
Signed-off-by: Gabor Nagy <mail@aigeruth.hu>
 2014-10-21 13:40:19 +02:00
Daniel Nephin fac49b62b6 Support setting project name from the environment. 
Signed-off-by: Daniel Nephin <dnephin@yelp.com>
 2014-09-29 18:01:08 -04:00
Daniel Nephin 7fd37c89b9 Remove fig.packages replace with real deps. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-09-05 11:44:49 -07:00
Daniel Nephin df7c2cc43f Resolves #369, add verbose output on --verbose flag 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-08-09 21:05:54 -04:00
Daniel Nephin 779f4bda01 Fix cli for python 2.6 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-07-15 13:07:46 -07:00