p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Don't add /.docker-id to the container filesystem

Browse Source 
Upstream-commit: ed03dbfe82f4481ea3845071606ef25c7ea2ec3e
Component: engine
This commit is contained in:
Solomon Hykes
2013-10-18 00:01:29 +00:00
parent 8e5b6c7d93
commit 27c3cb7365
2 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/changes.go
View File

@ -312,9 +312,5 @@ func ChangesDirs(newDir, oldDir string) ([]Change, error) {
return nil, err
}
// Ignore changes in .docker-id
_ = newRoot.Remove("/.docker-id")
_ = oldRoot.Remove("/.docker-id")
return newRoot.Changes(oldRoot), nil
}

16
components/engine/image.go
View File

@ -390,13 +390,6 @@ func (image *Image) ensureImageDevice(devices *devmapper.DeviceSetDM) error {
return err
}
if err := ioutil.WriteFile(path.Join(mountDir, ".docker-id"), []byte(image.ID), 0600); err != nil {
utils.Debugf("Error writing file: %s", err)
devices.UnmountDevice(image.ID, mountDir, true)
devices.RemoveDevice(image.ID)
return err
}
if err = image.applyLayer(layerPath(root), mountDir); err != nil {
utils.Debugf("Error applying layer: %s", err)
devices.UnmountDevice(image.ID, mountDir, true)
@ -456,14 +449,12 @@ func (image *Image) Mount(runtime *Runtime, root, rw string, id string) error {
return err
}
createdDevice := false
if !devices.HasDevice(id) {
utils.Debugf("Creating device %s for container based on image %s", id, image.ID)
err = devices.AddDevice(id, image.ID)
if err != nil {
return err
}
createdDevice = true
}
utils.Debugf("Mounting container %s at %s for container", id, root)
@ -471,13 +462,6 @@ func (image *Image) Mount(runtime *Runtime, root, rw string, id string) error {
return err
}
if createdDevice {
err = ioutil.WriteFile(path.Join(root, ".docker-id"), []byte(id), 0600)
if err != nil {
_ = devices.RemoveDevice(image.ID)
return err
}
}
return nil
}