Move logging config under separate key in v2 compose files #2626
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
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
Reorganize JSON schemas Update fixtures Update service validation function Signed-off-by: Joffrey F <joffrey@docker.com>
Additional test for legacy compose file. Signed-off-by: Joffrey F <joffrey@docker.com>
| @@ -523,6 +530,8 @@ def _get_container_create_options( | |||
| for k in DOCKER_CONFIG_KEYS if k in self.options) | |||
| container_options.update(override_options) | |||
|
|
|||
| container_options.update(self.get_logging_options()) | |||
|
|
|||
There was a problem hiding this comment.
Why is this required? I thought we only had to provide it to the HostConfig section which is done below.
There was a problem hiding this comment.
You're right, this doesn't look useful since those keys will be removed a few lines later.
|
A question and a request, but generally looks good. I'd really like to merge the fields_schema and service_schema into a single file, but I guess it's not urgent. |
Signed-off-by: Joffrey F <joffrey@docker.com>
Signed-off-by: Joffrey F <joffrey@docker.com>
Signed-off-by: Joffrey F <joffrey@docker.com>
|
@dnephin Addressed everything - PTAL. |
|
LGTM! thanks for making that test change |
|
LGTM |
aanand
added a commit
that referenced
this pull request
Jan 12, 2016
…nder-separate-key Move logging config under separate key in v2 compose files
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.
Implements #2503, based on #2561