7 Commits

Author	SHA1	Message	Date
Daniel Nephin	e9d6193dfd	Replace fmt.Errorf() with errors.Errorf() in the cli ... Signed-off-by: Daniel Nephin <dnephin@docker.com>	2017-03-24 16:58:07 -04:00
Vincent Demeester	6e24fc3f58	Merge pull request #30781 from AkihiroSuda/fix-stack-env ... compose: fix environment interpolation from the client	2017-03-17 15:56:50 +01:00
Daniel Nephin	b1a98b55af	Add --prune to stack deploy. ... Add to command line reference. Signed-off-by: Daniel Nephin <dnephin@docker.com>	2017-03-14 16:09:28 -04:00
Daniel Nephin	146d3eb304	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>	2017-03-14 16:00:43 -04:00
Akihiro Suda	b7ffa960bf	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>	2017-03-14 15:59:40 -04:00
Santhosh Manohar	6c7da0ca57	Enhance network inspect to show all tasks, local & non-local, in swarm mode ... Signed-off-by: Santhosh Manohar <santhosh@docker.com>	2017-03-13 17:52:08 -07:00
allencloud	16b1631594	split compose deploy from deploy.go ... Signed-off-by: allencloud <allen.sun@daocloud.io>	2017-02-17 17:13:31 +08:00