Daniel Nephin
72f1866047
Merge pull request #31795 from dnephin/compose-file-v3.2
...
Compose file v3.2
Upstream-commit: d1fc5acc2e
Component: cli
2017-03-14 14:10:24 -04:00
Justin Cormack
fb5e1898c8
Merge pull request #30597 from dnephin/add-expanded-mount-format-to-stack-deploy
...
Add expanded mount format to stack deploy
Upstream-commit: b8c49df008
Component: cli
2017-03-14 17:53:28 +00:00
Daniel Nephin
6f96d531a0
Add compose file version 3.2
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 2e9b15143a
Component: cli
2017-03-13 16:20:42 -04:00
Sebastiaan van Stijn
c9cfbb4d45
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: 4c4af071c7
Component: cli
2017-03-11 01:59:43 +01:00
Arash Deshmeh
ea19043c45
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: 789652c41a
Component: cli
2017-03-07 14:21:45 -05:00
James Nesbitt
22f2b40227
exported cli compose loader parsing methods
...
Signed-off-by: James Nesbitt <james.nesbitt@wunderkraut.com >
Upstream-commit: b6f45eb18e
Component: cli
2017-03-07 17:36:35 +02:00
Daniel Nephin
53c21bb298
Support expanded mounts in Compose loader
...
Add a test for loading expanded mount format.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 29f39ea244
Component: cli
2017-03-06 11:45:01 -05:00
Daniel Nephin
48d10d2797
Parse a volume spec on the client, with support for windows drives
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a442213b92
Component: cli
2017-03-06 11:45:01 -05:00
Yong Tang
7cfd3076e4
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: c53471254b
Component: cli
2017-02-07 09:14:56 -08:00
Yong Tang
857a9c8722
Add compose support of attachable in networks
...
This fix tries to address the issue raised in 29975 where
it was not possible to specify `attachable` flag for networks
in compose format.
NOTE: Compose format aleady supports `labels` in networks.
This fix adds the support of `attachable` for compose v3.1 format.
Additiona unit tests have been updated and added.
This fix fixes 29975.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 1a677699ae
Component: cli
2017-02-04 14:16:06 -08:00
Daniel Nephin
d1dc107dc1
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: 1eefdba226
Component: cli
2017-01-27 17:03:41 -05:00
Daniel Nephin
c63bb4b9c1
Test and fix external secrets in stack deploy.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 682d75fa3f
Component: cli
2017-01-26 11:33:15 -05:00
Daniel Nephin
5805451da4
Implement secret types for compose file.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 0382f4f365
Component: cli
2017-01-26 11:33:15 -05:00
Daniel Nephin
fb3da331a1
Add v3.1 schema and support validating multiple version.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 7215ebffa8
Component: cli
2017-01-26 11:33:15 -05: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