60 Commits

Author	SHA1	Message	Date
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