Formed in 2009, the Archive Team (not to be confused with the archive.org Archive-It Team) is a rogue archivist collective dedicated to saving copies of rapidly dying or deleted websites for the sake of history and digital heritage. The group is 100% composed of volunteers and interested parties, and has expanded into a large amount of related projects for saving online and digital history.
fix daemon won't start bug caused by daemon.json and cli flags duplications #37871
Conversation
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
… both daemon config file and cli flags Signed-off-by: Anda Xu <anda.xu@docker.com>
AntaresS
changed the title
|
LGTM |
|
This error message was added at the time to prevent conflicting options; with this change; if both a cli-option is set, and a |
|
@thaJeztah They will be merged together if both passed form cli and config file. this pr is just trying to resolve the conflict of |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
- What I did
runtimesfield defined indaemon.jsonfile as well as--containerd=<containerd address> --default-runtime=<name> --add-runtime=<runtime>passed from dockerd cli flag.
skipDuplicatesindaemon.goin order to allow some duplicated configurations defined in both config file and cli flag to be merged- How I did it
- How to verify it
- Description for the changelog
Signed-off-by: Anda Xu anda.xu@docker.com