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

11 Commits

Author SHA1 Message Date
Justin Cormack
975e2e2d89 Merge pull request #30597 from dnephin/add-expanded-mount-format-to-stack-deploy 
Add expanded mount format to stack deploy
Upstream-commit: 49376cddab7d2ea28fd08fbbb75522656a72ed09
Component: engine
 2017-03-14 17:53:28 +00:00
Sebastiaan van Stijn
da0af5d2c9 Merge pull request #31176 from adshmh/29662-stack-deploy-error-if-external-combined-with-other-volume-options 
stack deploy exits with error if both 'external' and other options are specified for a volume
Upstream-commit: 8b02a15d527edeaae9135c3f6d23948bf95efb55
Component: engine
 2017-03-11 01:59:43 +01:00
Arash Deshmeh
2678ec9975 stack deploy exits with error if both 'external' and any other options are specified for volumes 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 96039b394adebfe2754a6e57419a44a9489b8005
Component: engine
 2017-03-07 14:21:45 -05:00
James Nesbitt
26dbe98c09 exported cli compose loader parsing methods 
Signed-off-by: James Nesbitt <james.nesbitt@wunderkraut.com>
Upstream-commit: a1560a0cf2401ccf37d6b6859b57a9eecd339089
Component: engine
 2017-03-07 17:36:35 +02:00
Daniel Nephin
c8a5ce81db Support expanded mounts in Compose loader 
Add a test for loading expanded mount format.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 190dc5a40ab330bf0c2e2ce2954fd72526cabfe1
Component: engine
 2017-03-06 11:45:01 -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
4f66b8d7bd Remove the old loading system from compose config loading 
The original Compose config loading used the `compose` tag, which
was replaced by mapstructure. Some fields were left on the old tag. This
commit removes the old tag and uses types and mapstructure.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: daaeeafa7ae3a4afbff530861a9ed4a97e2c431f
Component: engine
 2017-01-27 17:03:41 -05:00
Daniel Nephin
f693277e41 Test and fix external secrets in stack deploy. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b3427e43edc56824f762e964c955b906fa363a3a
Component: engine
 2017-01-26 11:33:15 -05:00
Daniel Nephin
fc26836a78 Implement secret types for compose file. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9419e7df2b54b684bef6c787239a2c92fbb4acda
Component: engine
 2017-01-26 11:33:15 -05:00
Daniel Nephin
9fa961acee Add v3.1 schema and support validating multiple version. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 65374488f92512cf34667cb71ea6d62985310f65
Component: engine
 2017-01-26 11:33:15 -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