Introduce new config format with volume support and versioning#2113
Closed
shin- wants to merge 19 commits into
Closed
Introduce new config format with volume support and versioning#2113shin- wants to merge 19 commits into
shin- wants to merge 19 commits into
Conversation
There was a problem hiding this comment.
This doesn't need to be in a separate function. It's a dict lookup so can just be a line in pre_process_config function and then that way we're not doing validate_top_level_object twice.
Closed
|
Sorry, just so i understand correctly... Docker compose is going to be switching to using json now instead of yaml files? Just want to get ready for this change since i'll be upgrading as soon as the new version comes out. |
|
@michaeljs1990 no we're not switching to json. We can use jsonschema with yaml configuration since they deserialize into the same python structure. |
|
@dnephin thanks, sorry for the confusion. |
shin-
force-pushed
the
2110-volumes_config_support
branch
from
6bf736b to
6e1c4a7
Compare
shin-
force-pushed
the
2110-volumes_config_support
branch
3 times, most recently
from
607af35 to
2bdaabf
Compare
The validation module has been updated to detect automatically which version is being used and switch schemas accordingly. Signed-off-by: Joffrey F <joffrey@docker.com>
This change effectively discards the contents of the 'volumes' dictionary if using a v2 config. This will be implemented separately. The version is detected dynamically to support both legacy and v2 formats. Signed-off-by: Joffrey F <joffrey@docker.com>
Signed-off-by: Joffrey F <joffrey@docker.com>
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Rewrite some of the logic to better accomodate differing formats now and in the future. Signed-off-by: Joffrey F <joffrey@docker.com>
Reference service definition in the base field schema (v1) instead of copying it over. Limit acceptable types for driver options in volume definition. Signed-off-by: Joffrey F <joffrey@docker.com>
To support the expanding config format, we now use a complex `config.Config` object containing version, services, and volumes information. project.Project updated accordingly and tests take the new format into account. Signed-off-by: Joffrey F <joffrey@docker.com>
Add Volume class that supports basic volume operations (creation, removal, inspection). Project class sets up volume at the beginning of Project.up() Volume config is now properly passed down to Project class. Signed-off-by: Joffrey F <joffrey@docker.com>
Signed-off-by: Joffrey F <joffrey@docker.com>
API 1.21 is required to support volume declaration. Update tearDown method for integration tests to remove test volumes. Signed-off-by: Joffrey F <joffrey@docker.com>
The volume format returned by the API has changed in recent version, causing issues when trying to recreate containers with volumes attached. Signed-off-by: Joffrey F <joffrey@docker.com>
Signed-off-by: Joffrey F <joffrey@docker.com>
Signed-off-by: Joffrey F <joffrey@docker.com>
Signed-off-by: Joffrey F <joffrey@docker.com>
Volumes were being inserted in the services list, causing issues at runtime. Also catch API error when volume driver is invalid. Signed-off-by: Joffrey F <joffrey@docker.com>
Signed-off-by: Joffrey F <joffrey@docker.com>
Signed-off-by: Joffrey F <joffrey@docker.com>
Signed-off-by: Joffrey F <joffrey@docker.com>
shin-
force-pushed
the
2110-volumes_config_support
branch
from
322f713 to
84a9f0e
Compare
Signed-off-by: Joffrey F <joffrey@docker.com>
2 tasks
Author
|
Closing in favor of #2421 (because the code has undergone significant changes since, rewriting the PR had become easier than rebasing the changes). |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
This is a work in progress (volume support is not implemented) submitted early so we can start discussing the design approach and new schema.