Uh oh!
There was an error while loading. Please reload this page.
container: allow an empty --cidfile path from mktemp - #7239
Open
locker95 wants to merge 2 commits into
Open
Conversation
newCIDFile currently errors if the path already exists, even when the file is empty. mktemp creates that empty file first, so `docker run --cidfile=$(mktemp)` always fails. Keep refusing a path that already holds a container ID. Open/create otherwise so an empty file can be reused. Fixesdocker#5954 Signed-off-by: Dean Chen <862469039@qq.com>
| return nil, errors.New("container ID file found, make sure the other container isn't running or delete " + cidPath) | ||
| // mktemp (and similar) create an empty file first. Only refuse the path | ||
| // when it already holds a container ID from another run. | ||
| f, err := os.OpenFile(cidPath, os.O_RDWR|os.O_CREATE, 0o644) |
There was a problem hiding this comment.
If the file does not exist, it is created with mode 0o666 (before umask)
Author
There was a problem hiding this comment.
yeah, os.Create uses 0o666 before umask — switched to that.
Match os.Create's mode so a newly created --cidfile still gets 0o666 before umask, instead of a hardcoded 0o644. Signed-off-by: Dean Chen <862469039@qq.com>
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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
--cidfilecurrently errors if the path already exists, even when the file is empty.that's a pain with
mktemp, which creates the file first:only refuse the path if it already has content (another container's id). empty files get reused.
Fixes#5954