Colin Hebert
8df9b5486d
Add support for labels during build with compose
...
Signed-off-by: Colin Hebert <hebert.colin@gmail.com >
Upstream-commit: 1d1defa399157f1fc246bb5a8772bb1fc4305348
Component: engine
2017-04-15 05:31:28 +10:00
Daniel Nephin
9156acdd4f
Add support for volume consistency in compose format.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ae27355b095181748daa1d68d07f8e45904b14cc
Component: engine
2017-04-07 13:23:33 -04:00
Daniel Nephin
6bac6aa413
Fix compose schema id for v3.2
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 576d2181e453dbbf75254aa11bc90c1a86a1384f
Component: engine
2017-03-16 13:53:58 -04:00
Daniel Nephin
af1bbd0867
Add compose file version 3.2
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e7bf5be18b1a97b6f2b5eb6c6976fe9544589efe
Component: engine
2017-03-13 16:20:42 -04:00
Daniel Nephin
b2d648703b
Move endpoint_mode under deploy and add it to the schema.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 751552c65f244917ce74d09d0f528308a6b35755
Component: engine
2017-03-13 15:00:56 -04:00
Daniel Nephin
578c6e5b0b
Add expanded mount syntax to Compose schema and types.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 65c899bee501a81e004187528e732d944ef904d5
Component: engine
2017-03-06 11:45:01 -05:00
Yong Tang
5c8fdca78f
Add expanded port syntax to Compose schema and types.
...
This commit adds expanded port syntax to Compose schema and types
so that it is possible to have
```
ports:
- mode: host
target: 80
published: 9005
```
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 60c1eaf8f08f904248cbfa0d07d850025a35e6d0
Component: engine
2017-02-07 09:12:55 -08:00
Yong Tang
a86724bb15
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: cf4b7a5b876cfa91a1bea22d248e4925c8e2bf71
Component: engine
2017-02-04 14:16:06 -08:00
Daniel Nephin
dd9f330ae3
Rebase Compose v3.1 schema on the latest v3 schema.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b4f23bbc69f58662f8d94b0492d693e43d523e47
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
f1f3f030a1
Add missing network.internal.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 408fd20be25c309454503c0b1e1c31914cf87dad
Component: engine
2017-01-20 12:53:19 -05:00
Daniel Nephin
22c718e439
Update Compose schema to match docker-compose.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: de1ffebf19595e061c85727a4c34ac02ad4e934d
Component: engine
2017-01-20 12:36:57 -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