github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

rmdir tmp dirs for rootfs mounts

Browse Source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2017-12-04 13:28:39 -05:00
parent b0ca685874
commit a8b543f87d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
container_opts_unix.go
View File

@ -192,7 +192,7 @@ func remapRootFS(mounts []mount.Mount, uid, gid uint32) error {
if err != nil { if err != nil {
return err return err
} }
defer os.RemoveAll(root) defer os.Remove(root)
for _, m := range mounts { for _, m := range mounts {
if err := m.Mount(root); err != nil { if err := m.Mount(root); err != nil {
return err return err

6
diff/walking/differ.go
View File

@ -94,7 +94,7 @@ func (s *walkingDiff) Apply(ctx context.Context, desc ocispec.Descriptor, mounts
if err != nil { if err != nil {
return emptyDesc, errors.Wrap(err, "failed to create temporary directory") 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 { if err := mount.All(mounts, dir); err != nil {
return emptyDesc, errors.Wrap(err, "failed to mount") 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 { if err != nil {
return emptyDesc, errors.Wrap(err, "failed to create temporary directory") return emptyDesc, errors.Wrap(err, "failed to create temporary directory")
} }
defer os.RemoveAll(aDir) defer os.Remove(aDir)
bDir, err := ioutil.TempDir("", "right-") bDir, err := ioutil.TempDir("", "right-")
if err != nil { if err != nil {
return emptyDesc, errors.Wrap(err, "failed to create temporary directory") 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 { if err := mount.All(lower, aDir); err != nil {
return emptyDesc, errors.Wrap(err, "failed to mount") return emptyDesc, errors.Wrap(err, "failed to mount")

4
oci/spec_opts_unix.go
View File

@ -275,7 +275,7 @@ func WithUserID(uid uint32) SpecOpts {
if err != nil { if err != nil {
return err return err
} }
defer os.RemoveAll(root) defer os.Remove(root)
for _, m := range mounts { for _, m := range mounts {
if err := m.Mount(root); err != nil { if err := m.Mount(root); err != nil {
return err return err
@ -338,7 +338,7 @@ func WithUsername(username string) SpecOpts {
if err != nil { if err != nil {
return err return err
} }
defer os.RemoveAll(root) defer os.Remove(root)
for _, m := range mounts { for _, m := range mounts {
if err := m.Mount(root); err != nil { if err := m.Mount(root); err != nil {
return err return err