toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,631 Commits 3 Branches 295 Tags
0a80911d2de364982fe2701957e4792df8517958
Commit Graph

8 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
2dc7385741 Merge pull request #31795 from dnephin/compose-file-v3.2 
Compose file v3.2
Upstream-commit: cd56476f1862ae03cd125779e1d1f9fab293c248
Component: engine
 2017-03-14 14:10:24 -04:00
allencloud
a8bf637055 support both endpoint modes in stack 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 96790657288699146f579382f25d932c87125e86
Component: engine
 2017-03-13 15:00:49 -04:00
Daniel Nephin
c96952c905 Support customizing the default network for a stack. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b7577dd2ad6fbb2cf21baf7ee082d2f605157b2a
Component: engine
 2017-02-24 17:32:23 -05:00
Yong Tang
d6535af489 Support expanded ports in Compose loader 
This commit adds support for expanded ports in Compose loader,
and add several unit tests for loading expanded port format.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: f07a28a54165b6a2e49e9d0e6d3a111252095cb5
Component: engine
 2017-02-07 09:14:56 -08:00
Daniel Nephin
6300d8ca1e Fix parsing resources from compose file for stack deploy. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e3f083530f27bc57fceab684fb3182b79a960e79
Component: engine
 2017-01-09 14:22:02 -05: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
Daniel Nephin
c9e434865c Move pkg to cli/compose/convert 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 643fd775edb0a05d649f4d484e966428eb3a6b09
Component: engine
 2016-12-16 12:27:31 -05:00