rmdir tmp dirs for rootfs mounts

crosbymichael · crosbymichael · commit a8b543f87d6e · 2017-12-04T13:51:11.000-05:00
Signed-off-by: Michael Crosby &lt;crosbymichael@gmail.com&gt;
diff --git a/container_opts_unix.go b/container_opts_unix.go
@@ -192,7 +192,7 @@ func remapRootFS(mounts []mount.Mount, uid, gid uint32) error {
 	if err != nil {
 		return err
 	}
-	defer os.RemoveAll(root)
+	defer os.Remove(root)
 	for _, m := range mounts {
 		if err := m.Mount(root); err != nil {
 			return err
diff --git a/diff/walking/differ.go b/diff/walking/differ.go
@@ -94,7 +94,7 @@ func (s *walkingDiff) Apply(ctx context.Context, desc ocispec.Descriptor, mounts
 	if err != nil {
 		return emptyDesc, errors.Wrap(err, "failed to create temporary directory")
 	}
-	defer os.RemoveAll(dir)
+	defer os.Remove(dir)
 
 	if err := mount.All(mounts, dir); err != nil {
 		return emptyDesc, errors.Wrap(err, "failed to mount")
@@ -164,13 +164,13 @@ func (s *walkingDiff) DiffMounts(ctx context.Context, lower, upper []mount.Mount
 	if err != nil {
 		return emptyDesc, errors.Wrap(err, "failed to create temporary directory")
 	}
-	defer os.RemoveAll(aDir)
+	defer os.Remove(aDir)
 
 	bDir, err := ioutil.TempDir("", "right-")
 	if err != nil {
 		return emptyDesc, errors.Wrap(err, "failed to create temporary directory")
 	}
-	defer os.RemoveAll(bDir)
+	defer os.Remove(bDir)
 
 	if err := mount.All(lower, aDir); err != nil {
 		return emptyDesc, errors.Wrap(err, "failed to mount")
diff --git a/oci/spec_opts_unix.go b/oci/spec_opts_unix.go
@@ -275,7 +275,7 @@ func WithUserID(uid uint32) SpecOpts {
 		if err != nil {
 			return err
 		}
-		defer os.RemoveAll(root)
+		defer os.Remove(root)
 		for _, m := range mounts {
 			if err := m.Mount(root); err != nil {
 				return err
@@ -338,7 +338,7 @@ func WithUsername(username string) SpecOpts {
 		if err != nil {
 			return err
 		}
-		defer os.RemoveAll(root)
+		defer os.Remove(root)
 		for _, m := range mounts {
 			if err := m.Mount(root); err != nil {
 				return err

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ func remapRootFS(mounts []mount.Mount, uid, gid uint32) error {`
`192`	`192`	`if err != nil {`
`193`	`193`	`return err`
`194`	`194`	`}`
`195`		`- defer os.RemoveAll(root)`
	`195`	`+ defer os.Remove(root)`
`196`	`196`	`for _, m := range mounts {`
`197`	`197`	`if err := m.Mount(root); err != nil {`
`198`	`198`	`return err`