docker-cli

Author SHA1 Message Date

Author	SHA1	Message	Date
Daniel Nephin	63bca6acc7	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: `146d3eb304` Component: cli	2017-03-14 16:00:43 -04:00
Akihiro Suda	85cd81c04a	compose: fix environment interpolation from the client For an environment variable defined in the yaml without value, the value needs to be propagated from the client, as in Docker Compose. Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp> Upstream-commit: `b7ffa960bf` Component: cli	2017-03-14 15:59:40 -04:00
Daniel Nephin	6a9af71e6e	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: `52c0157036` Component: cli	2016-12-27 16:17:24 -05:00

63bca6acc7

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: 146d3eb304
Component: cli

2017-03-14 16:00:43 -04:00

Akihiro Suda

85cd81c04a

compose: fix environment interpolation from the client

For an environment variable defined in the yaml without value,
the value needs to be propagated from the client, as in Docker Compose.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: b7ffa960bf
Component: cli

2017-03-14 15:59:40 -04:00

Daniel Nephin

6a9af71e6e

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: 52c0157036
Component: cli

2016-12-27 16:17:24 -05:00

3 Commits