docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23067 from shishir-a412ed/fix_commit_issue 

Fixes Issue # 22992: docker commit failing
This commit is contained in:
Michael Crosby 2016-05-27 15:06:29 -07:00
parent 4441a6c4c6 09d0720e2f
commit b1f8b45b8f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/graphdriver/devmapper/driver.go
View File

@ -160,8 +160,9 @@ func (d *Driver) Remove(id string) error {
// Get mounts a device with given id into the root filesystem // Get mounts a device with given id into the root filesystem
func (d *Driver) Get(id, mountLabel string) (string, error) { func (d *Driver) Get(id, mountLabel string) (string, error) {
mp := path.Join(d.home, "mnt", id) mp := path.Join(d.home, "mnt", id)
rootFs := path.Join(mp, "rootfs")
if count := d.ctr.Increment(mp); count > 1 { if count := d.ctr.Increment(mp); count > 1 {
return mp, nil return rootFs, nil
} }
uid, gid, err := idtools.GetRootUIDGID(d.uidMaps, d.gidMaps) uid, gid, err := idtools.GetRootUIDGID(d.uidMaps, d.gidMaps)
@ -186,7 +187,6 @@ func (d *Driver) Get(id, mountLabel string) (string, error) {
return "", err return "", err
} }
rootFs := path.Join(mp, "rootfs")
if err := idtools.MkdirAllAs(rootFs, 0755, uid, gid); err != nil && !os.IsExist(err) { if err := idtools.MkdirAllAs(rootFs, 0755, uid, gid); err != nil && !os.IsExist(err) {
d.ctr.Decrement(mp) d.ctr.Decrement(mp)
d.DeviceSet.UnmountDevice(id, mp) d.DeviceSet.UnmountDevice(id, mp)