skip container ID remapping, if the file is overlayfs whiteout.#35822
Merged
yongtang merged 1 commit intomoby:masterfrom Jan 3, 2018
Merged
Conversation
thaJeztah
added
area/security/userns
status/2-code-review
and removed
status/0-triage
labels
Member
|
ping @estesp @dmcgowan @kolyshkin PTAL |
keyolk
force-pushed
the
35709-fix-docker-build-overlayfs-whiteout
branch
2 times, most recently
from
6e6d722 to
f5c0831
Compare
yongtang
approved these changes
Jan 2, 2018
pkg/archive/archive.go
Outdated
Member
There was a problem hiding this comment.
nit: looks like this line might be changed to:
isOverlayWhiteout := fi.Mode()&os.ModeCharDevice != 0 && hdr.Devmajor == 0 && hdr.Devminor == 0
?
Signed-off-by: Chanhun Jeong <chanhun.jeong@navercorp.com>
keyolk
force-pushed
the
35709-fix-docker-build-overlayfs-whiteout
branch
from
f5c0831 to
b013c15
Compare
yongtang
approved these changes
Jan 3, 2018
Member
yongtang
left a comment
yongtang
left a comment
There was a problem hiding this comment.
Looks like the comment has been addressed and all tests passed, LGTM. Thanks!
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
5 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.
fixes #35709
Signed-off-by: Chanhun Jeong chanhun.jeong@navercorp.com
- What I did
during docker image build,
do check whether the file in intermediate container is overlayfs whiteout (0/0 device).
if then, skip uid/gid remapping.
- How I did it
using AUFS, dockerd skips its whiteout file,
but not for overlayfs.
- How to verify it
with userns, overlay2 storage driver,
do below,
then check whether the file /etc/services is removed.
- Description for the changelog
skip container ID remapping, if the file is overlayfs whiteout.
- A picture of a cute animal (not mandatory but encouraged)
: - ()