From 824c72f4727504e3a8d37f87ce88733c560d4129 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 6 Apr 2016 21:06:42 -0700 Subject: [PATCH] Fix overlay test running on overlay Overlay tests were failing when /var/tmp was an overlay mount with a misleading message. Now overlay tests will be skipped when attempting to be run on overlay. Tests will now use the TMPDIR environment variable instead of only /var/tmp Fixes #21686 Signed-off-by: Derek McGowan (github: dmcgowan) --- daemon/graphdriver/graphtest/graphtest_unix.go | 2 +- daemon/graphdriver/overlay/overlay.go | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/daemon/graphdriver/graphtest/graphtest_unix.go b/daemon/graphdriver/graphtest/graphtest_unix.go index 6ea3ed0422..8b4ee580e7 100644 --- a/daemon/graphdriver/graphtest/graphtest_unix.go +++ b/daemon/graphdriver/graphtest/graphtest_unix.go @@ -67,7 +67,7 @@ func getBaseLoopStats() (*syscall.Stat_t, error) { } func newDriver(t *testing.T, name string) *Driver { - root, err := ioutil.TempDir("/var/tmp", "docker-graphtest-") + root, err := ioutil.TempDir("", "docker-graphtest-") if err != nil { t.Fatal(err) } diff --git a/daemon/graphdriver/overlay/overlay.go b/daemon/graphdriver/overlay/overlay.go index a1cc1451b5..f3dbb1ffa7 100644 --- a/daemon/graphdriver/overlay/overlay.go +++ b/daemon/graphdriver/overlay/overlay.go @@ -120,7 +120,7 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap backingFs = fsName } - // check if they are running over btrfs or aufs + // check if they are running over btrfs, aufs, zfs or overlay switch fsMagic { case graphdriver.FsMagicBtrfs: logrus.Error("'overlay' is not supported over btrfs.") @@ -131,6 +131,9 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap case graphdriver.FsMagicZfs: logrus.Error("'overlay' is not supported over zfs.") return nil, graphdriver.ErrIncompatibleFS + case graphdriver.FsMagicOverlay: + logrus.Error("'overlay' is not supported over overlay.") + return nil, graphdriver.ErrIncompatibleFS } rootUID, rootGID, err := idtools.GetRootUIDGID(uidMaps, gidMaps)