New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

skip container ID remapping, if the file is overlayfs whiteout. #35822

Merged
merged 1 commit into from Jan 3, 2018

Conversation

Projects
None yet
5 participants
@keyolk
Contributor

keyolk commented Dec 18, 2017

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,

docker build -f - . <<<$'FROM centos\nRUN ls -lad /etc/se*; rm -v /etc/services\nRUN ls -lad /etc/se*'

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)
: - ()

@thaJeztah

This comment has been minimized.

Show comment
Hide comment
@thaJeztah
Member

thaJeztah commented Dec 18, 2017

@estesp

estesp approved these changes Dec 18, 2017

LGTM

@yongtang

One nit, LGTM overall.

Show outdated Hide outdated pkg/archive/archive.go
skip container ID remapping, if the file is overlayfs whiteout.
Signed-off-by: Chanhun Jeong <chanhun.jeong@navercorp.com>
@yongtang

Looks like the comment has been addressed and all tests passed, LGTM. Thanks!

@yongtang yongtang merged commit 99c22b0 into moby:master Jan 3, 2018

6 checks passed

dco-signed All commits are signed
experimental Jenkins build Docker-PRs-experimental 38560 has succeeded
Details
janky Jenkins build Docker-PRs 47296 has succeeded
Details
powerpc Jenkins build Docker-PRs-powerpc 7689 has succeeded
Details
windowsRS1 Jenkins build Docker-PRs-WoW-RS1 18804 has succeeded
Details
z Jenkins build Docker-PRs-s390x 7538 has succeeded
Details

@keyolk keyolk deleted the keyolk:35709-fix-docker-build-overlayfs-whiteout branch Jan 4, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment