New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compose file v3.2 #31795

Merged
merged 7 commits into from Mar 14, 2017

Conversation

Projects
None yet
5 participants
@dnephin
Member

dnephin commented Mar 13, 2017

Includes changes from #31112, and #30597

Revert the Compose file schema to the version that was released as v3.1
Add the new v3.2 schema with all the new changes

Compose PR for these schemas docker/compose#4616

cc @vdemeester @shin-

dnephin and others added some commits Jan 19, 2017

Add expanded mount syntax to Compose schema and types.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Support expanded mounts in Compose loader
Add a test for loading expanded mount format.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Parse a volume spec on the client, with support for windows drives
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Convert new compose volume type to swarm mount type
Signed-off-by: Daniel Nephin <dnephin@docker.com>
support both endpoint modes in stack
Signed-off-by: allencloud <allen.sun@daocloud.io>
Move endpoint_mode under deploy and add it to the schema.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Add compose file version 3.2
Signed-off-by: Daniel Nephin <dnephin@docker.com>
@vdemeester

LGTM 🦁
/cc @vieux @thaJeztah
@dnephin targeting 17.04 right ?

@thaJeztah

LGTM

@thaJeztah

This comment has been minimized.

Show comment
Hide comment
@thaJeztah

thaJeztah Mar 14, 2017

Member

I see @cpuguy83 had a question on #30597 (comment) so let's wait merging to be sure

Member

thaJeztah commented Mar 14, 2017

I see @cpuguy83 had a question on #30597 (comment) so let's wait merging to be sure

@dnephin dnephin added this to the 17.04.0 milestone Mar 14, 2017

@dnephin

This comment has been minimized.

Show comment
Hide comment
@dnephin

dnephin Mar 14, 2017

Member

That PR is now merged, so merging this as well

Member

dnephin commented Mar 14, 2017

That PR is now merged, so merging this as well

@dnephin dnephin merged commit cd56476 into moby:master Mar 14, 2017

6 checks passed

dco-signed All commits are signed
experimental Jenkins build Docker-PRs-experimental 31649 has succeeded
Details
janky Jenkins build Docker-PRs 40273 has succeeded
Details
powerpc Jenkins build Docker-PRs-powerpc 373 has succeeded
Details
windowsRS1 Jenkins build Docker-PRs-WoW-RS1 11353 has succeeded
Details
z Jenkins build Docker-PRs-s390x 233 has succeeded
Details

@dnephin dnephin deleted the dnephin:compose-file-v3.2 branch Mar 14, 2017

dnephin added a commit to dnephin/docker that referenced this pull request Apr 17, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment