Revert "remove default "containerd.toml" config file"#233
Merged
fredericdalleau merged 1 commit intodocker:masterfrom May 21, 2021
Merged
Conversation
This reverts commit 37e406c. Relates to docker#215 (comment) > removing this does have some impact on rpm users who are currently overwriting > the rpm supplied config.toml with their own. This being removed above, causes > the user supplied override config.toml file also to be deleted, when they upgrade > to a rpm version with this change. rpm moves the file to.rpmsave/.rpmnew after > upgrading to the new version with the above change. Reverting this change (at least temporarily until we figure out an alternative) is the safest option for now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This was referenced May 19, 2021
Merged
Member
Author
tianon
approved these changes
May 19, 2021
Member
Author
|
Yes, I was considering just to revert only the RPM changes, but it's worth looking into "other options" (if possible); if not, then we could also consider making this change for the v1.5.x release |
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
3 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 reverts commit 37e406c.
Relates to #215 (comment)
Reverting this change (at least temporarily until we figure out an alternative)
is the safest option for now.