Skip to content
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

Add 3.7 schema and add rollback_config to it #5992

Merged
merged 2 commits into from
May 30, 2018

Conversation

vdemeester
Copy link

Mirrors docker/cli#409. As for update_config, it will be ignore by docker-compose 😉

cc @thaJeztah @shin-

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
compose/const.py Outdated
@@ -67,4 +69,5 @@
API_VERSIONS[COMPOSEFILE_V3_4]: '17.06.0',
API_VERSIONS[COMPOSEFILE_V3_5]: '17.06.0',
API_VERSIONS[COMPOSEFILE_V3_6]: '18.02.0',
API_VERSIONS[COMPOSEFILE_V3_7]: '18.02.0',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

18.06.0?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well, I wasn't sure about that. From my understanding, it's the "lowest" API version supported. And so far, there is nothing in v3.7 that wasn't already supported by v3.6 ; this is why I did put the same version.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's true that we used to do that, however, in retrospect it confuses people and makes things harder to document. For people who insist on using newer Compose file versions with an older engine (I don't think there are many), they can always set COMPOSE_API_VERSION to override.

As a result I'd recommend using 18.06.0 here.

Copy link

@shin- shin- left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM other than that one thing

Ignoring it on docker-compose

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
@vdemeester
Copy link
Author

Updated 👼

@shin- shin- merged commit b9cccf2 into docker:master May 30, 2018
@shin-
Copy link

shin- commented May 30, 2018

Thank you! 🥇

@thaJeztah
Copy link
Member

Note that ideally, we'd have some other compose-file changes in as well;

@shin- not sure if you work with release-branches, so let me know if you were planning to do a release (because after it's in a release, we likely can't change the compose-file spec anymore)

@vdemeester for the above; issues; I'll try to find some time, but if you have some and can help 🤗

@shin-
Copy link

shin- commented May 30, 2018

@thaJeztah I don't think we'll do a release before at least mid-June, so things should be alright on that end.

@thaJeztah
Copy link
Member

Thanks! Feel free to ping me if things change in that respect 👍

@vdemeester vdemeester deleted the 3.7-rollback-config branch May 30, 2018 22:19
@vdemeester
Copy link
Author

@thaJeztah can take care of it 😉

@thaJeztah
Copy link
Member

@vdemeester docker/cli#479 could be tricky; when I had the CLI working, I think SwarmKit still didn't pick up the configuration (but perhaps I did something wrong); I can push that branch as a quick WIP

@shin- shin- added this to the 1.22.0 milestone Jun 21, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants