fix containers

darstahl · darstahl · commit f1ca1f957004 · 2018-05-07T17:10:21.000-07:00
Signed-off-by: Darren Stahl &lt;darst@microsoft.com&gt;
diff --git a/windows/runtime.go b/windows/runtime.go
@@ -21,6 +21,7 @@ package windows
 import (
 	"context"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"sync"
 	"time"
@@ -247,13 +248,17 @@ func (r *windowsRuntime) newTask(ctx context.Context, namespace, id string, root
 		}
 	}()
 
-	if err := mount.All(rootfs, ""); err != nil {
+	mountLocation, err := ioutil.TempDir("", "containerd-rootfs")
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to create temp rootfs folder")
+	}
+	if err := mount.All(rootfs, mountLocation); err != nil {
 		return nil, errors.Wrap(err, "failed to mount rootfs")
 	}
 	defer func() {
 		if err != nil {
-			if err := mount.UnmountAll(rootfs[0].Source, 0); err != nil {
-				log.G(ctx).WithError(err).WithField("path", rootfs[0].Source).
+			if err := mount.UnmountAll(mountLocation, 0); err != nil {
+				log.G(ctx).WithError(err).WithField("path", mountLocation).
 					Warn("failed to unmount rootfs on failure")
 			}
 		}
@@ -295,6 +300,7 @@ func (r *windowsRuntime) newTask(ctx context.Context, namespace, id string, root
 		publisher:         r.publisher,
 		rwLayer:           conf.LayerFolderPath,
 		rootfs:            rootfs,
+		mountLocation:     mountLocation,
 		pidPool:           r.pidPool,
 		hcsContainer:      ctr,
 		terminateDuration: createOpts.TerminateDuration,
diff --git a/windows/task.go b/windows/task.go
@@ -48,9 +48,10 @@ type task struct {
 	processes map[string]*process
 	hyperV    bool
 
-	publisher events.Publisher
-	rwLayer   string
-	rootfs    []mount.Mount
+	publisher     events.Publisher
+	rwLayer       string
+	mountLocation string
+	rootfs        []mount.Mount
 
 	pidPool           *pidPool
 	hcsContainer      hcsshim.Container
