p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,104 Commits 2 Branches 295 Tags
e7900cc574261fa1afca2a2c0d7417c022e1a36e
Commit Graph

8 Commits

Author SHA1 Message Date
Daniel Nephin
f6580aefb9 Set Composefile WorkingDir to dirname of the composefile. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: cad32e0111cec6088cf26cbb122e816fc0a3f6c8
Component: engine
 2017-04-17 15:14:58 -04:00
Daniel Nephin
7cc7eec39f Replace fmt.Errorf() with errors.Errorf() in the cli 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 7b7ea8ab810190018346cb7d84c161bb94f7ca60
Component: engine
 2017-03-24 16:58:07 -04:00
Vincent Demeester
bddb190597 Merge pull request #30781 from AkihiroSuda/fix-stack-env 
compose: fix environment interpolation from the client
Upstream-commit: 8bc703804de45bafe4e6362d150d6c74db8dd7db
Component: engine
 2017-03-17 15:56:50 +01:00
Daniel Nephin
6a9291e20f Add --prune to stack deploy. 
Add to command line reference.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 644fd804fce63499812259331b0a9f2a4a3ebcc4
Component: engine
 2017-03-14 16:09:28 -04:00
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
Akihiro Suda
52e6564dcd 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: ea43c33330ec9a1e9a9b8a85348c1757fdae65c4
Component: engine
 2017-03-14 15:59:40 -04:00
Santhosh Manohar
ff11389227 Enhance network inspect to show all tasks, local & non-local, in swarm mode 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 14f76a21db71c5a817cb4d1e27f9940cefd5c820
Component: engine
 2017-03-13 17:52:08 -07:00
allencloud
5f5d704cba split compose deploy from deploy.go 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: f46a14f7b611276256c7e8148e87c1d570201d74
Component: engine
 2017-02-17 17:13:31 +08:00