2 Commits

Author	SHA1	Message	Date
Daniel Nephin	258019e01c	Fix environment resolving. ... Load from env should only happen if the value is unset. Extract a buildEnvironment function and revert some changes to tests. Signed-off-by: Daniel Nephin <dnephin@docker.com> Upstream-commit: a9c86b63c03fc3557748d7792c11041387cb93d9 Component: engine	2017-03-14 16:00:43 -04:00
Daniel Nephin	edfbbc6ec9	Replace vendor of aanand/compose-file with a local copy. ... Add go-bindata for including the schema. Signed-off-by: Daniel Nephin <dnephin@docker.com> Upstream-commit: f5af9b9738892b5988f987ce5fbce6e31a10e768 Component: engine	2016-12-27 16:17:24 -05:00