From ed03dbfe82f4481ea3845071606ef25c7ea2ec3e Mon Sep 17 00:00:00 2001
From: Solomon Hykes <solomon@dotcloud.com>
Date: Fri, 18 Oct 2013 00:01:29 +0000
Subject: [PATCH] Don't add /.docker-id to the container filesystem

---
 changes.go |  4 ----
 image.go   | 16 ----------------
 2 files changed, 20 deletions(-)

diff --git a/changes.go b/changes.go
index bf31114cdd..765dca77b6 100644
--- a/changes.go
+++ b/changes.go
@@ -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
 }
diff --git a/image.go b/image.go
index eead33f068..71e65e4533 100644
--- a/image.go
+++ b/image.go
@@ -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
 }