Ben Firshman
a467a8a094
Merge pull request #1261 from aanand/fix-vars-in-volume-paths
...
Fix vars in volume paths
(cherry picked from commit 4926f8aef629631032327542a56ae35099807005)
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Conflicts:
tests/unit/service_test.py
2015-04-09 15:26:10 +01:00
Daniel Nephin
e4e802d1f8
Merge pull request #1213 from moysesb/relative_build
...
Make value of 'build:' relative to the yml file.
(cherry picked from commit 0f70b8638ff7167e9755d24dc8dab1579662f72d)
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-01 11:00:48 -04:00
Aanand Prasad
b24a60ba9f
Merge pull request #1226 from aanand/merge-multi-value-options
...
Merge multi-value options when extending
(cherry picked from commit e708f4f59dcb417e90a5bbdcadcee37e8c6b7802)
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-01 11:00:45 -04:00
Aanand Prasad
461b600068
Merge pull request #1225 from aanand/fix-1222
...
When extending, `build` replaces `image` and vice versa
(cherry picked from commit 6dbe321a45dfd7539234f889825b54e1a026e46f)
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-01 11:00:40 -04: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
