cli/compose: add schema 3.10, with optional version field (default to "latest") #3257
+641
−2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment has been minimized.
This comment has been minimized.
thaJeztah
force-pushed
the
compose_remove_required_version
branch
from
b84b7c1 to
297230b
Compare
|
Easiest to review per commit; the "main" bits are in the last commit |
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Adding a copy of the 3.9 schema, with only the version-string changed. This makes it easier to find changes since 3.9, which are added after this. Signed-off-by: Sebastiaan van Stijn <[email protected]>
The compose spec (https://compose-spec.io) defines the version to be optional, and implementations of the spec to check for supported attributes instead. While this change does not switch the `docker stack` implementation to use the compose-spec, it makes it function more similar. Previously, omitting a version number would either produce an error (as the field was required), or switched the handling to assume it was version 1.0 (which is deprecated). With this change, compose files without a version number will be handled as the latest version supported by `docker stack` (currently 3.10). This allows users that work with docker-compose or docker compose (v2) to deploy their compose file, without having to re-add a version number. Fields that are not supported by stackes (schema 3.10) will still produce an error. Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
force-pushed
the
compose_remove_required_version
branch
from
297230b to
a777880
Compare
|
Rebased to get a fresh run of CI |
ndeloof
approved these changes
Feb 18, 2022
|
let's bring this in I think I had a follow-up stashed somewhere as well; will dig it up and open a PR for that |
|
@thaJeztah |
Yes, that's correct; plan is to do a release next month (if all goes well 👍) |
|
Is this not merged into Docker Desktop yet? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The compose spec (https://compose-spec.io) defines the version to be optional,
and implementations of the spec to check for supported attributes instead.
While this change does not switch the
docker stackimplementation to use thecompose-spec, it makes it function more similar. Previously, omitting a version
number would either produce an error (as the field was required), or switched
the handling to assume it was version 1.0 (which is deprecated).
With this change, compose files without a version number will be handled as
the latest version supported by
docker stack(currently 3.10). This allowsusers that work with docker-compose or docker compose (v2) to deploy their
compose file, without having to re-add a version number. Fields that are
not supported by
docker stack(schema 3.10) will still produce an error.- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)