fix daemon won't start bug caused by daemon.json and cli flags duplications #37871
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
runtimes
field defined indaemon.json
file as well as--containerd=<containerd address> --default-runtime=<name> --add-runtime=<runtime>
passed from dockerd cli flag.
skipDuplicates
indaemon.go
in 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