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

overlay2: fix unmounting layer without merge dir #31069

Merged
merged 1 commit into from Feb 17, 2017

Conversation

@tonistiigi
Member

tonistiigi commented Feb 16, 2017

@dmcgowan

Signed-off-by: Tonis Tiigi tonistiigi@gmail.com

overlay2: fix unmounting layer without merge dir
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
@cpuguy83

Looks ok but why wouldn't there be a merge dir?

@@ -30,7 +30,7 @@ import (
"github.com/docker/docker/pkg/mount"
"github.com/docker/docker/pkg/parsers"
"github.com/docker/docker/pkg/parsers/kernel"
"github.com/docker/go-units"
units "github.com/docker/go-units"

This comment has been minimized.

@cpuguy83

cpuguy83 Feb 17, 2017

Contributor

looks like it's not needed?

@cpuguy83

cpuguy83 Feb 17, 2017

Contributor

looks like it's not needed?

This comment has been minimized.

@vdemeester

vdemeester Feb 17, 2017

Member

I do like that though 👼

@vdemeester

vdemeester Feb 17, 2017

Member

I do like that though 👼

@dmcgowan

One of those situations where I would have thought this was already done

LGTM

@vdemeester

LGTM 🐸

@@ -30,7 +30,7 @@ import (
"github.com/docker/docker/pkg/mount"
"github.com/docker/docker/pkg/parsers"
"github.com/docker/docker/pkg/parsers/kernel"
"github.com/docker/go-units"
units "github.com/docker/go-units"

This comment has been minimized.

@vdemeester

vdemeester Feb 17, 2017

Member

I do like that though 👼

@vdemeester

vdemeester Feb 17, 2017

Member

I do like that though 👼

@vdemeester vdemeester merged commit 146bc07 into moby:master Feb 17, 2017

4 checks passed

dco-signed All commits are signed
experimental Jenkins build Docker-PRs-experimental 30804 has succeeded
Details
janky Jenkins build Docker-PRs 39419 has succeeded
Details
windowsRS1 Jenkins build Docker-PRs-WoW-RS1 10478 has succeeded
Details

@GordonTheTurtle GordonTheTurtle added this to the 1.14.0 milestone Feb 17, 2017

@thaJeztah thaJeztah added this to PRs in 17.03.2-maybe Mar 2, 2017

@thaJeztah thaJeztah modified the milestones: 17.03.1, 17.04.0 Mar 9, 2017

@thaJeztah

This comment has been minimized.

Show comment
Hide comment
@thaJeztah

thaJeztah Mar 22, 2017

Member

cherry-picked into 17.03.1 through #31754

Member

thaJeztah commented Mar 22, 2017

cherry-picked into 17.03.1 through #31754

@thaJeztah thaJeztah removed this from PRs in 17.03.2-maybe Mar 22, 2017

liusdu pushed a commit to liusdu/moby that referenced this pull request Oct 30, 2017

overlay2: fix unmounting layer without merge dir
cherry-pick from: moby#31069

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit e1af6c8)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment