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

21 Commits

Author SHA1 Message Date
Mazz Mosley 6e4a954dbd 'file' key can be omitted from extends 
If the 'file' key is not set in the extends_options dict then we
look for the 'service' from within the same file.

Fixes this issue: https://github.com/docker/compose/issues/1237

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-07-03 11:26:30 +01:00
Aanand Prasad db7e5124f3 Merge pull request #1488 from dnephin/config_from_stdin 
Support reading config from stdin
 2015-07-03 09:03:40 +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
Jeff Kramer 8709dc3c24 Added env var parsing to volume container paths 
This commit adds environment variable parsing to the container side
of the volume mapping in configs. The common use case for this is
mounting SSH agent sockets in a container, using code like:

volumes:
    - $SSH_AUTH_SOCK:$SSH_AUTH_SOCK
environment:
    - SSH_AUTH_SOCK

Signed-off-by: Jeff Kramer <jeff.kramer@voxmedia.com>
 2015-07-02 13:13:38 -05:00
Aanand Prasad b0cb31c186 Use 'top' instead of 'sleep' as a dummy command 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-05-21 16:24:29 +01:00
delbert@umn.edu df87bd91c8 Added devices configuration option 
Signed-off-by: Dan Elbert <dan.elbert@gmail.com>
 2015-05-11 10:50:58 -05:00
Daniel Nephin 6c95eed781 Merge pull request #1269 from aanand/labels 
Implement 'labels' option
 2015-04-30 20:49:11 -04:00
Aanand Prasad 2e6bc078fb Implement 'labels' option 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-29 16:45:18 +01:00
Timothy Van Heest 855855a0e6 Fix for #1350, nonexisting build path in parent section causes extending section to fail 
Signed-off-by: Timothy Van Heest <timothy.vanheest@gmail.com>
 2015-04-27 10:55:30 -04:00
Aanand Prasad fd568b389d Fix home directory and env expansion in volume paths 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-07 16:23:45 +01:00
Moysés Borges 8584525e8d Interpret 'build:' as relative to the yml file 
* This fix introduces one side-effect: the build parameter is now
validated early, when the service dicionary is first constructed.
That leads to less scary stack traces when the path is not valid.

* The tests for the changes introduced here alter the fixtures
of those (otherwise unrelated) tests that make use of the 'build:'
parameter)

Signed-off-by: Moysés Borges Furtado <moyses.furtado@wplex.com.br>
 2015-03-31 18:47:26 -03:00
Aanand Prasad 907918b492 Merge multi-value options when extending 
Closes #1143.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-31 15:30:59 -04:00
Aanand Prasad 2a415ede08 When extending, `build` replaces `image` and vice versa 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-30 17:14:19 -04: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
Aanand Prasad 35c6e0314c Fix volume merging when there's no explicit host path 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-24 13:26:36 -07:00
Aanand Prasad 276e43ca6b Fix service dict merging when only one dict has a volumes key 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-24 13:26:36 -07:00
Aanand Prasad 37efdb1f8b Make volume host paths relative to file, merge volumes when extending 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-20 15:45:16 -07:00
Aanand Prasad 4c582e4352 Implement `extends` 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-20 15:45:16 -07:00
Aanand Prasad 528bed9ef6 Fix environment resolution 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-13 14:22:28 +00:00
Aanand Prasad 4ecf5e01ff Extract YAML loading and parsing into config module 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-13 14:21:58 +00:00