@@ -11,7 +11,6 @@ import (

 	"syscall"

 	"testing"

-	"github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/api/types/swarm"

 	cliconfig "github.com/docker/docker/cli/config"

 	"github.com/docker/docker/integration-cli/daemon"

@@ -40,40 +39,6 @@ var (

 	// the docker client binary to use

 	dockerBinary = "docker"

-

-	// isLocalDaemon is true if the daemon under test is on the same

-	// host as the CLI.

-	isLocalDaemon bool

-	// daemonPlatform is held globally so that tests can make intelligent

-	// decisions on how to configure themselves according to the platform

-	// of the daemon. This is initialized in docker_utils by sending

-	// a version call to the daemon and examining the response header.

-	daemonPlatform string

-

-	// WindowsBaseImage is the name of the base image for Windows testing

-	// Environment variable WINDOWS_BASE_IMAGE can override this

-	WindowsBaseImage string

-

-	// For a local daemon on Linux, these values will be used for testing

-	// user namespace support as the standard graph path(s) will be

-	// appended with the root remapped uid.gid prefix

-	dockerBasePath       string

-	volumesConfigPath    string

-	containerStoragePath string

-

-	// daemonStorageDriver is held globally so that tests can know the storage

-	// driver of the daemon. This is initialized in docker_utils by sending

-	// a version call to the daemon and examining the response header.

-	daemonStorageDriver string

-

-	// isolation is the isolation mode of the daemon under test

-	isolation container.Isolation

-

-	// experimentalDaemon tell whether the main daemon has

-	// experimental features enabled or not

-	experimentalDaemon bool

-

-	daemonKernelVersion string

 )

 func init() {

@@ -86,22 +51,6 @@ func init() {

 		fmt.Println(err)

 		os.Exit(1)

 	}

-

-	assignGlobalVariablesFromTestEnv(testEnv)

-}

-

-// FIXME(vdemeester) remove this and use environment

-func assignGlobalVariablesFromTestEnv(testEnv *environment.Execution) {

-	isLocalDaemon = testEnv.LocalDaemon()

-	daemonPlatform = testEnv.DaemonPlatform()

-	dockerBasePath = testEnv.DockerBasePath()

-	volumesConfigPath = testEnv.VolumesConfigPath()

-	containerStoragePath = testEnv.ContainerStoragePath()

-	daemonStorageDriver = testEnv.DaemonStorageDriver()

-	isolation = testEnv.Isolation()

-	experimentalDaemon = testEnv.ExperimentalDaemon()

-	daemonKernelVersion = testEnv.DaemonKernelVersion()

-	WindowsBaseImage = testEnv.MinimalBaseImage()

 }

 func TestMain(m *testing.M) {

@@ -125,17 +74,17 @@ func TestMain(m *testing.M) {

 	for _, img := range images {

 		protectedImages[img] = struct{}{}

 	}

-	if !isLocalDaemon {

-		fmt.Println("INFO: Testing against a remote daemon")

-	} else {

+	if testEnv.LocalDaemon() {

 		fmt.Println("INFO: Testing against a local daemon")

+	} else {

+		fmt.Println("INFO: Testing against a remote daemon")

 	}

 	exitCode := m.Run()

 	os.Exit(exitCode)

 }

 func Test(t *testing.T) {

-	if daemonPlatform == "linux" {

+	if testEnv.DaemonPlatform() == "linux" {

 		ensureFrozenImagesLinux(t)

 	}

 	check.TestingT(t)

@@ -149,7 +98,7 @@ type DockerSuite struct {

 }

 func (s *DockerSuite) OnTimeout(c *check.C) {

-	if testEnv.DaemonPID() > 0 && isLocalDaemon {

+	if testEnv.DaemonPID() > 0 && testEnv.LocalDaemon() {

 		daemon.SignalDaemonDump(testEnv.DaemonPID())

 	}

 }

@@ -160,7 +109,7 @@ func (s *DockerSuite) TearDownTest(c *check.C) {

 	deleteAllImages(c)

 	deleteAllVolumes(c)

 	deleteAllNetworks(c)

-	if daemonPlatform == "linux" {

+	if testEnv.DaemonPlatform() == "linux" {

 		deleteAllPlugins(c)

 	}

 }

@@ -185,7 +134,7 @@ func (s *DockerRegistrySuite) SetUpTest(c *check.C) {

 	testRequires(c, DaemonIsLinux, registry.Hosting)

 	s.reg = setupRegistry(c, false, "", "")

 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: experimentalDaemon,

+		Experimental: testEnv.ExperimentalDaemon(),

 	})

 }

@@ -219,7 +168,7 @@ func (s *DockerSchema1RegistrySuite) SetUpTest(c *check.C) {

 	testRequires(c, DaemonIsLinux, registry.Hosting, NotArm64)

 	s.reg = setupRegistry(c, true, "", "")

 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: experimentalDaemon,

+		Experimental: testEnv.ExperimentalDaemon(),

 	})

 }

@@ -253,7 +202,7 @@ func (s *DockerRegistryAuthHtpasswdSuite) SetUpTest(c *check.C) {

 	testRequires(c, DaemonIsLinux, registry.Hosting)

 	s.reg = setupRegistry(c, false, "htpasswd", "")

 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: experimentalDaemon,

+		Experimental: testEnv.ExperimentalDaemon(),

 	})

 }

@@ -288,7 +237,7 @@ func (s *DockerRegistryAuthTokenSuite) OnTimeout(c *check.C) {

 func (s *DockerRegistryAuthTokenSuite) SetUpTest(c *check.C) {

 	testRequires(c, DaemonIsLinux, registry.Hosting)

 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: experimentalDaemon,

+		Experimental: testEnv.ExperimentalDaemon(),

 	})

 }

@@ -329,7 +278,7 @@ func (s *DockerDaemonSuite) OnTimeout(c *check.C) {

 func (s *DockerDaemonSuite) SetUpTest(c *check.C) {

 	testRequires(c, DaemonIsLinux, SameHostDaemon)

 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: experimentalDaemon,

+		Experimental: testEnv.ExperimentalDaemon(),

 	})

 }

@@ -387,7 +336,7 @@ func (s *DockerSwarmSuite) SetUpTest(c *check.C) {

 func (s *DockerSwarmSuite) AddDaemon(c *check.C, joinSwarm, manager bool) *daemon.Swarm {

 	d := &daemon.Swarm{

 		Daemon: daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-			Experimental: experimentalDaemon,

+			Experimental: testEnv.ExperimentalDaemon(),

 		}),

 		Port: defaultSwarmPort + s.portIndex,

 	}

@@ -16,7 +16,7 @@ import (

 func (s *DockerSuite) TestBuildAPIDockerFileRemote(c *check.C) {

 	testRequires(c, NotUserNamespace)

 	var testD string

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		testD = `FROM busybox

 COPY * /tmp/

 RUN find / -name ba*

@@ -919,7 +919,7 @@ func (s *DockerSuite) TestContainerAPIStart(c *check.C) {

 	c.Assert(err, checker.IsNil)

 	// TODO(tibor): figure out why this doesn't work on windows

-	if isLocalDaemon {

+	if testEnv.LocalDaemon() {

 		c.Assert(status, checker.Equals, http.StatusNotModified)

 	}

 }

@@ -943,7 +943,7 @@ func (s *DockerSuite) TestContainerAPIWait(c *check.C) {

 	name := "test-api-wait"

 	sleepCmd := "/bin/sleep"

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		sleepCmd = "sleep"

 	}

 	dockerCmd(c, "run", "--name", name, "busybox", sleepCmd, "2")

@@ -1112,7 +1112,7 @@ func (s *DockerSuite) TestContainerAPIDeleteRemoveVolume(c *check.C) {

 	testRequires(c, SameHostDaemon)

 	vol := "/testvolume"

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		vol = `c:\testvolume`

 	}

@@ -1769,7 +1769,7 @@ func (s *DockerSuite) TestContainersAPICreateMountsCreate(c *check.C) {

 		err     error

 		testImg string

 	)

-	if daemonPlatform != "windows" {

+	if testEnv.DaemonPlatform() != "windows" {

 		testImg, err = buildImage("test-mount-config", `

 	FROM busybox

 	RUN mkdir `+destPath+` && touch `+destPath+slash+`bar

@@ -1822,7 +1822,7 @@ func (s *DockerSuite) TestContainersAPICreateMountsCreate(c *check.C) {

 		}

 	}

-	if daemonPlatform != "windows" { // Windows does not support volume populate

+	if testEnv.DaemonPlatform() != "windows" { // Windows does not support volume populate

 		cases = append(cases, []testCase{

 			{mounttypes.Mount{Type: "volume", Target: destPath, VolumeOptions: &mounttypes.VolumeOptions{NoCopy: true}}, types.MountPoint{Driver: volume.DefaultDriverName, Type: "volume", RW: true, Destination: destPath}},

 			{mounttypes.Mount{Type: "volume", Target: destPath + slash, VolumeOptions: &mounttypes.VolumeOptions{NoCopy: true}}, types.MountPoint{Driver: volume.DefaultDriverName, Type: "volume", RW: true, Destination: destPath}},

@@ -1872,7 +1872,7 @@ func (s *DockerSuite) TestContainersAPICreateMountsCreate(c *check.C) {

 		}

 		out, _, err := dockerCmdWithError("start", "-a", id)

-		if (x.cfg.Type != "volume" || (x.cfg.VolumeOptions != nil && x.cfg.VolumeOptions.NoCopy)) && daemonPlatform != "windows" {

+		if (x.cfg.Type != "volume" || (x.cfg.VolumeOptions != nil && x.cfg.VolumeOptions.NoCopy)) && testEnv.DaemonPlatform() != "windows" {

 			c.Assert(err, checker.NotNil, check.Commentf("%s\n%v", out, mps[0]))

 		} else {

 			c.Assert(err, checker.IsNil, check.Commentf("%s\n%v", out, mps[0]))

@@ -73,7 +73,7 @@ func (s *DockerSuite) TestAPIImagesSaveAndLoad(c *check.C) {

 }

 func (s *DockerSuite) TestAPIImagesDelete(c *check.C) {

-	if daemonPlatform != "windows" {

+	if testEnv.DaemonPlatform() != "windows" {

 		testRequires(c, Network)

 	}

 	name := "test-api-images-delete"

@@ -97,7 +97,7 @@ func (s *DockerSuite) TestAPIImagesDelete(c *check.C) {

 }

 func (s *DockerSuite) TestAPIImagesHistory(c *check.C) {

-	if daemonPlatform != "windows" {

+	if testEnv.DaemonPlatform() != "windows" {

 		testRequires(c, Network)

 	}

 	name := "test-api-images-history"

@@ -27,7 +27,7 @@ func (s *DockerSuite) TestInspectAPIContainerResponse(c *check.C) {

 	var cases []acase

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		cases = []acase{

 			{"v1.25", append(keysBase, "Mounts")},

 		}

@@ -38,7 +38,7 @@ func (s *DockerSuite) TestAPIStatsNoStreamGetCpu(c *check.C) {

 	var cpuPercent = 0.0

-	if daemonPlatform != "windows" {

+	if testEnv.DaemonPlatform() != "windows" {

 		cpuDelta := float64(v.CPUStats.CPUUsage.TotalUsage - v.PreCPUStats.CPUUsage.TotalUsage)

 		systemDelta := float64(v.CPUStats.SystemUsage - v.PreCPUStats.SystemUsage)

 		cpuPercent = (cpuDelta / systemDelta) * float64(len(v.CPUStats.CPUUsage.PercpuUsage)) * 100.0

@@ -104,7 +104,7 @@ func (s *DockerSuite) TestAPIStatsNetworkStats(c *check.C) {

 	// Retrieve the container address

 	net := "bridge"

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		net = "nat"

 	}

 	contIP := findContainerIP(c, id, net)

@@ -152,7 +152,7 @@ func (s *DockerSuite) TestAPIStatsNetworkStats(c *check.C) {

 	// On Linux, account for ARP.

 	expRxPkts := preRxPackets + uint64(numPings)

 	expTxPkts := preTxPackets + uint64(numPings)

-	if daemonPlatform != "windows" {

+	if testEnv.DaemonPlatform() != "windows" {

 		expRxPkts++

 		expTxPkts++

 	}

@@ -36,7 +36,7 @@ func (s *DockerSuite) TestAPIGetEnabledCORS(c *check.C) {

 }

 func (s *DockerSuite) TestAPIClientVersionOldNotSupported(c *check.C) {

-	if daemonPlatform != runtime.GOOS {

+	if testEnv.DaemonPlatform() != runtime.GOOS {

 		c.Skip("Daemon platform doesn't match test platform")

 	}

 	if api.MinVersion == api.DefaultVersion {

@@ -33,7 +33,7 @@ type DockerAuthzV2Suite struct {

 func (s *DockerAuthzV2Suite) SetUpTest(c *check.C) {

 	testRequires(c, DaemonIsLinux, Network)

 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: experimentalDaemon,

+		Experimental: testEnv.ExperimentalDaemon(),

 	})

 	s.d.Start(c)

 }

@@ -65,7 +65,7 @@ type authorizationController struct {

 func (s *DockerAuthzSuite) SetUpTest(c *check.C) {

 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: experimentalDaemon,

+		Experimental: testEnv.ExperimentalDaemon(),

 	})

 	s.ctrl = &authorizationController{}

 }

@@ -36,7 +36,7 @@ func (s *DockerSuite) TestBuildJSONEmptyRun(c *check.C) {

 func (s *DockerSuite) TestBuildShCmdJSONEntrypoint(c *check.C) {

 	name := "testbuildshcmdjsonentrypoint"

 	expected := "/bin/sh -c echo test"

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		expected = "cmd /S /C echo test"

 	}

@@ -74,7 +74,7 @@ func (s *DockerSuite) TestBuildEnvironmentReplacementVolume(c *check.C) {

 	var volumePath string

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		volumePath = "c:/quux"

 	} else {

 		volumePath = "/quux"

@@ -131,7 +131,7 @@ func (s *DockerSuite) TestBuildEnvironmentReplacementWorkdir(c *check.C) {

 	res := inspectFieldJSON(c, name, "Config.WorkingDir")

 	expected := `"/work"`

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		expected = `"C:\\work"`

 	}

 	if res != expected {

@@ -634,7 +634,7 @@ RUN [ $(cat "/test dir/test_file6") = 'test6' ]`, command, command, command, com

 func (s *DockerSuite) TestBuildCopyFileWithWhitespaceOnWindows(c *check.C) {

 	testRequires(c, DaemonIsWindows)

-	dockerfile := `FROM ` + WindowsBaseImage + `

+	dockerfile := `FROM ` + testEnv.MinimalBaseImage() + `

 RUN mkdir "C:/test dir"

 RUN mkdir "C:/test_dir"

 COPY [ "test file1", "/test_file1" ]

@@ -1387,7 +1387,7 @@ func (s *DockerSuite) TestBuildRelativeWorkdir(c *check.C) {

 		expectedFinal string

 	)

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		expected1 = `C:/`

 		expected2 = `C:/test1`

 		expected3 = `C:/test2`

@@ -1466,7 +1466,7 @@ func (s *DockerSuite) TestBuildWorkdirWithEnvVariables(c *check.C) {

 	name := "testbuildworkdirwithenvvariables"

 	var expected string

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		expected = `C:\test1\test2`

 	} else {

 		expected = `/test1/test2`

@@ -1488,7 +1488,7 @@ func (s *DockerSuite) TestBuildRelativeCopy(c *check.C) {

 	testRequires(c, NotUserNamespace)

 	var expected string

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		expected = `C:/test1/test2`

 	} else {

 		expected = `/test1/test2`

@@ -1597,7 +1597,7 @@ func (s *DockerSuite) TestBuildContextCleanup(c *check.C) {

 	testRequires(c, SameHostDaemon)

 	name := "testbuildcontextcleanup"

-	entries, err := ioutil.ReadDir(filepath.Join(dockerBasePath, "tmp"))

+	entries, err := ioutil.ReadDir(filepath.Join(testEnv.DockerBasePath(), "tmp"))

 	if err != nil {

 		c.Fatalf("failed to list contents of tmp dir: %s", err)

 	}

@@ -1605,7 +1605,7 @@ func (s *DockerSuite) TestBuildContextCleanup(c *check.C) {

 	buildImageSuccessfully(c, name, withDockerfile(`FROM `+minimalBaseImage()+`

         ENTRYPOINT ["/bin/echo"]`))

-	entriesFinal, err := ioutil.ReadDir(filepath.Join(dockerBasePath, "tmp"))

+	entriesFinal, err := ioutil.ReadDir(filepath.Join(testEnv.DockerBasePath(), "tmp"))

 	if err != nil {

 		c.Fatalf("failed to list contents of tmp dir: %s", err)

 	}

@@ -1619,7 +1619,7 @@ func (s *DockerSuite) TestBuildContextCleanupFailedBuild(c *check.C) {

 	testRequires(c, SameHostDaemon)

 	name := "testbuildcontextcleanup"

-	entries, err := ioutil.ReadDir(filepath.Join(dockerBasePath, "tmp"))

+	entries, err := ioutil.ReadDir(filepath.Join(testEnv.DockerBasePath(), "tmp"))

 	if err != nil {

 		c.Fatalf("failed to list contents of tmp dir: %s", err)

 	}

@@ -1629,7 +1629,7 @@ func (s *DockerSuite) TestBuildContextCleanupFailedBuild(c *check.C) {

 		ExitCode: 1,

 	})

-	entriesFinal, err := ioutil.ReadDir(filepath.Join(dockerBasePath, "tmp"))

+	entriesFinal, err := ioutil.ReadDir(filepath.Join(testEnv.DockerBasePath(), "tmp"))

 	if err != nil {

 		c.Fatalf("failed to list contents of tmp dir: %s", err)

 	}

@@ -2253,7 +2253,7 @@ func (s *DockerSuite) TestBuildAddFileNotFound(c *check.C) {

 	name := "testbuildaddnotfound"

 	expected := "foo: no such file or directory"

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		expected = "foo: The system cannot find the file specified"

 	}

@@ -2307,7 +2307,7 @@ func (s *DockerSuite) TestBuildOnBuild(c *check.C) {

 // gh #2446

 func (s *DockerSuite) TestBuildAddToSymlinkDest(c *check.C) {

 	makeLink := `ln -s /foo /bar`

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		makeLink = `mklink /D C:\bar C:\foo`

 	}

 	name := "testbuildaddtosymlinkdest"

@@ -3299,7 +3299,7 @@ func (s *DockerSuite) TestBuildCmdShDashC(c *check.C) {

 	res := inspectFieldJSON(c, name, "Config.Cmd")

 	expected := `["/bin/sh","-c","echo cmd"]`

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		expected = `["cmd","/S","/C","echo cmd"]`

 	}

 	if res != expected {

@@ -3374,7 +3374,7 @@ func (s *DockerSuite) TestBuildEntrypointCanBeOverridenByChildInspect(c *check.C

 		expected = `["/bin/sh","-c","echo quux"]`

 	)

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		expected = `["cmd","/S","/C","echo quux"]`

 	}

@@ -3431,7 +3431,7 @@ func (s *DockerSuite) TestBuildVerifySingleQuoteFails(c *check.C) {

 	// it should barf on it.

 	name := "testbuildsinglequotefails"

 	expectedExitCode := 2

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		expectedExitCode = 127

 	}

@@ -3447,7 +3447,7 @@ func (s *DockerSuite) TestBuildVerboseOut(c *check.C) {

 	name := "testbuildverboseout"

 	expected := "\n123\n"

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		expected = "\n123\r\n"

 	}

@@ -3463,7 +3463,7 @@ func (s *DockerSuite) TestBuildWithTabs(c *check.C) {

 	res := inspectFieldJSON(c, name, "ContainerConfig.Cmd")

 	expected1 := `["/bin/sh","-c","echo\tone\t\ttwo"]`

 	expected2 := `["/bin/sh","-c","echo\u0009one\u0009\u0009two"]` // syntactically equivalent, and what Go 1.3 generates

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		expected1 = `["cmd","/S","/C","echo\tone\t\ttwo"]`

 		expected2 = `["cmd","/S","/C","echo\u0009one\u0009\u0009two"]` // syntactically equivalent, and what Go 1.3 generates

 	}

@@ -3656,7 +3656,7 @@ func (s *DockerSuite) TestBuildStderr(c *check.C) {

 	result.Assert(c, icmd.Success)

 	// Windows to non-Windows should have a security warning

-	if runtime.GOOS == "windows" && daemonPlatform != "windows" && !strings.Contains(result.Stdout(), "SECURITY WARNING:") {

+	if runtime.GOOS == "windows" && testEnv.DaemonPlatform() != "windows" && !strings.Contains(result.Stdout(), "SECURITY WARNING:") {

 		c.Fatalf("Stdout contains unexpected output: %q", result.Stdout())

 	}

@@ -3775,7 +3775,7 @@ func (s *DockerSuite) TestBuildVolumesRetainContents(c *check.C) {

 		volName  = "/foo"

 	)

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		volName = "C:/foo"

 	}

@@ -4139,7 +4139,7 @@ RUN echo "  \

 	expected := "\n    foo  \n"

 	// Windows uses the builtin echo, which preserves quotes

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		expected = "\"    foo  \""

 	}

@@ -4173,7 +4173,7 @@ func (s *DockerSuite) TestBuildMissingArgs(c *check.C) {

 		"INSERT":     {},

 	}

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		skipCmds = map[string]struct{}{

 			"CMD":        {},

 			"RUN":        {},

@@ -4306,7 +4306,7 @@ func (s *DockerSuite) TestBuildRUNErrMsg(c *check.C) {

 	name := "testbuildbadrunerrmsg"

 	shell := "/bin/sh -c"

 	exitCode := 127

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		shell = "cmd /S /C"

 		// architectural - Windows has to start the container to determine the exe is bad, Linux does not

 		exitCode = 1

@@ -4460,7 +4460,7 @@ func (s *DockerTrustSuite) TestTrustedBuildTagIgnoresOtherDelegationRoles(c *che

 func (s *DockerSuite) TestBuildNullStringInAddCopyVolume(c *check.C) {

 	name := "testbuildnullstringinaddcopyvolume"

 	volName := "nullvolume"

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		volName = `C:\\nullvolume`

 	}

@@ -4500,7 +4500,7 @@ func (s *DockerSuite) TestBuildBuildTimeArg(c *check.C) {

 	envKey := "foo"

 	envVal := "bar"

 	var dockerfile string

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		// Bugs in Windows busybox port - use the default base image and native cmd stuff

 		dockerfile = fmt.Sprintf(`FROM `+minimalBaseImage()+`

 			ARG %s

@@ -5008,7 +5008,7 @@ func (s *DockerSuite) TestBuildBuildTimeArgDefintionWithNoEnvInjection(c *check.

 func (s *DockerSuite) TestBuildNoNamedVolume(c *check.C) {

 	volName := "testname:/foo"

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		volName = "testname:C:\\foo"

 	}

 	dockerCmd(c, "run", "-v", volName, "busybox", "sh", "-c", "touch /foo/oops")

@@ -5226,7 +5226,7 @@ func (s *DockerSuite) TestBuildWorkdirWindowsPath(c *check.C) {

 	testRequires(c, DaemonIsWindows)

 	name := "testbuildworkdirwindowspath"

 	buildImageSuccessfully(c, name, withDockerfile(`

-	FROM `+WindowsBaseImage+`

+	FROM `+testEnv.MinimalBaseImage()+`

 	RUN mkdir C:\\work

 	WORKDIR C:\\work

 	RUN if "%CD%" NEQ "C:\work" exit -1

@@ -5911,7 +5911,7 @@ func (s *DockerSuite) TestBuildOpaqueDirectory(c *check.C) {

 func (s *DockerSuite) TestBuildWindowsUser(c *check.C) {

 	testRequires(c, DaemonIsWindows)

 	name := "testbuildwindowsuser"

-	buildImageNew(name, withDockerfile(`FROM `+WindowsBaseImage+`

+	buildImageNew(name, withDockerfile(`FROM `+testEnv.MinimalBaseImage()+`

 		RUN net user user /add

 		USER user

 		RUN set username

@@ -5942,7 +5942,7 @@ func (s *DockerSuite) TestBuildWindowsEnvCaseInsensitive(c *check.C) {

 	testRequires(c, DaemonIsWindows)

 	name := "testbuildwindowsenvcaseinsensitive"

 	buildImageSuccessfully(c, name, withDockerfile(`

-		FROM `+WindowsBaseImage+`

+		FROM `+testEnv.MinimalBaseImage()+`

 		ENV FOO=bar foo=baz

   `))

 	res := inspectFieldJSON(c, name, "Config.Env")

@@ -5962,7 +5962,7 @@ WORKDIR /foo/bar

 	// The Windows busybox image has a blank `cmd`

 	lookingFor := `["sh"]`

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		lookingFor = "null"

 	}

 	c.Assert(strings.TrimSpace(out), checker.Equals, lookingFor)

@@ -636,7 +636,7 @@ func (s *DockerRegistrySuite) TestPullFailsWithAlteredLayer(c *check.C) {

 	// digest verification for the target layer digest.

 	// Remove distribution cache to force a re-pull of the blobs

-	if err := os.RemoveAll(filepath.Join(dockerBasePath, "image", s.d.StorageDriver(), "distribution")); err != nil {

+	if err := os.RemoveAll(filepath.Join(testEnv.DockerBasePath(), "image", s.d.StorageDriver(), "distribution")); err != nil {

 		c.Fatalf("error clearing distribution cache: %v", err)

 	}

@@ -679,7 +679,7 @@ func (s *DockerSchema1RegistrySuite) TestPullFailsWithAlteredLayer(c *check.C) {

 	// digest verification for the target layer digest.

 	// Remove distribution cache to force a re-pull of the blobs

-	if err := os.RemoveAll(filepath.Join(dockerBasePath, "image", s.d.StorageDriver(), "distribution")); err != nil {

+	if err := os.RemoveAll(filepath.Join(testEnv.DockerBasePath(), "image", s.d.StorageDriver(), "distribution")); err != nil {

 		c.Fatalf("error clearing distribution cache: %v", err)

 	}

@@ -41,7 +41,7 @@ func (s *DockerSuite) TestCpCheckDestOwnership(c *check.C) {

 }

 func getRootUIDGID() (int, int, error) {

-	uidgid := strings.Split(filepath.Base(dockerBasePath), ".")

+	uidgid := strings.Split(filepath.Base(testEnv.DockerBasePath()), ".")

 	if len(uidgid) == 1 {

 		//user namespace remapping is not turned on; return 0

 		return 0, 0, nil

@@ -58,7 +58,7 @@ func (s *DockerSuite) TestCreateArgs(c *check.C) {

 // Make sure we can grow the container's rootfs at creation time.

 func (s *DockerSuite) TestCreateGrowRootfs(c *check.C) {

 	// Windows and Devicemapper support growing the rootfs

-	if daemonPlatform != "windows" {

+	if testEnv.DaemonPlatform() != "windows" {

 		testRequires(c, Devicemapper)

 	}

 	out, _ := dockerCmd(c, "create", "--storage-opt", "size=120G", "busybox")

@@ -226,8 +226,8 @@ func (s *DockerSuite) TestCreateLabelFromImage(c *check.C) {

 func (s *DockerSuite) TestCreateHostnameWithNumber(c *check.C) {

 	image := "busybox"

 	// Busybox on Windows does not implement hostname command

-	if daemonPlatform == "windows" {

-		image = WindowsBaseImage

+	if testEnv.DaemonPlatform() == "windows" {

+		image = testEnv.MinimalBaseImage()

 	}

 	out, _ := dockerCmd(c, "run", "-h", "web.0", image, "hostname")

 	c.Assert(strings.TrimSpace(out), checker.Equals, "web.0", check.Commentf("hostname not set, expected `web.0`, got: %s", out))

@@ -411,7 +411,7 @@ func (s *DockerSuite) TestCreateWithWorkdir(c *check.C) {

 	dockerCmd(c, "create", "--name", name, "-w", dir, "busybox")

 	// Windows does not create the workdir until the container is started

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		dockerCmd(c, "start", name)

 	}

 	dockerCmd(c, "cp", fmt.Sprintf("%s:%s", name, dir), prefix+slash+"tmp")

@@ -1398,7 +1398,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithSocketAsVolume(c *check.C) {

 // A subsequent daemon restart shoud clean up said mounts.

 func (s *DockerDaemonSuite) TestCleanupMountsAfterDaemonAndContainerKill(c *check.C) {

 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: experimentalDaemon,

+		Experimental: testEnv.ExperimentalDaemon(),

 	})

 	d.StartWithBusybox(c)

@@ -1431,7 +1431,7 @@ func (s *DockerDaemonSuite) TestCleanupMountsAfterDaemonAndContainerKill(c *chec

 // os.Interrupt should perform a graceful daemon shutdown and hence cleanup mounts.

 func (s *DockerDaemonSuite) TestCleanupMountsAfterGracefulShutdown(c *check.C) {

 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: experimentalDaemon,

+		Experimental: testEnv.ExperimentalDaemon(),

 	})

 	d.StartWithBusybox(c)

@@ -1652,7 +1652,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartLocalVolumes(c *check.C) {

 // FIXME(vdemeester) should be a unit test

 func (s *DockerDaemonSuite) TestDaemonCorruptedLogDriverAddress(c *check.C) {

 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: experimentalDaemon,

+		Experimental: testEnv.ExperimentalDaemon(),

 	})

 	c.Assert(d.StartWithError("--log-driver=syslog", "--log-opt", "syslog-address=corrupted:42"), check.NotNil)

 	expected := "Failed to set log opts: syslog-address should be in form proto://address"

@@ -1662,7 +1662,7 @@ func (s *DockerDaemonSuite) TestDaemonCorruptedLogDriverAddress(c *check.C) {

 // FIXME(vdemeester) should be a unit test

 func (s *DockerDaemonSuite) TestDaemonCorruptedFluentdAddress(c *check.C) {

 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: experimentalDaemon,

+		Experimental: testEnv.ExperimentalDaemon(),

 	})

 	c.Assert(d.StartWithError("--log-driver=fluentd", "--log-opt", "fluentd-address=corrupted:c"), check.NotNil)

 	expected := "Failed to set log opts: invalid fluentd-address corrupted:c: "

@@ -19,7 +19,7 @@ func (s *DockerSuite) TestDiffFilenameShownInOutput(c *check.C) {

 	// a "Files/" prefix.

 	containerID := strings.TrimSpace(out)

 	lookingFor := "A /foo/bar"

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		err := waitExited(containerID, 60*time.Second)

 		c.Assert(err, check.IsNil)

 		lookingFor = "C Files/foo/bar"

@@ -688,7 +688,7 @@ func (s *DockerSuite) TestEventsContainerRestart(c *check.C) {

 	// wait until test2 is auto removed.

 	waitTime := 10 * time.Second

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		// Windows takes longer...

 		waitTime = 90 * time.Second

 	}

@@ -53,7 +53,7 @@ type graphEventsCounter struct {

 func (s *DockerExternalGraphdriverSuite) SetUpTest(c *check.C) {

 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: experimentalDaemon,

+		Experimental: testEnv.ExperimentalDaemon(),

 	})

 }

@@ -51,7 +51,7 @@ type DockerExternalVolumeSuite struct {

 func (s *DockerExternalVolumeSuite) SetUpTest(c *check.C) {

 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: experimentalDaemon,

+		Experimental: testEnv.ExperimentalDaemon(),

 	})

 	s.ec = &eventCounter{}

 }

@@ -118,7 +118,7 @@ func (s *DockerSuite) TestHelpTextVerify(c *check.C) {

 		cmdsToTest = append(cmdsToTest, "network ls")

 		cmdsToTest = append(cmdsToTest, "network rm")

-		if experimentalDaemon {

+		if testEnv.ExperimentalDaemon() {

 			cmdsToTest = append(cmdsToTest, "checkpoint create")

 			cmdsToTest = append(cmdsToTest, "checkpoint ls")

 			cmdsToTest = append(cmdsToTest, "checkpoint rm")

@@ -36,7 +36,7 @@ func (s *DockerSuite) TestInfoEnsureSucceeds(c *check.C) {

 		"Live Restore Enabled:",

 	}

-	if daemonPlatform == "linux" {

+	if testEnv.DaemonPlatform() == "linux" {

 		stringsToCheck = append(stringsToCheck, "Init Binary:", "Security Options:", "containerd version:", "runc version:", "init version:")

 	}

@@ -44,7 +44,7 @@ func (s *DockerSuite) TestInfoEnsureSucceeds(c *check.C) {

 		stringsToCheck = append(stringsToCheck, "Runtimes:", "Default Runtime: runc")

 	}

-	if experimentalDaemon {

+	if testEnv.ExperimentalDaemon() {

 		stringsToCheck = append(stringsToCheck, "Experimental: true")

 	} else {

 		stringsToCheck = append(stringsToCheck, "Experimental: false")

@@ -72,7 +72,7 @@ func (s *DockerSuite) TestInfoDiscoveryBackend(c *check.C) {

 	testRequires(c, SameHostDaemon, DaemonIsLinux)

 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: experimentalDaemon,

+		Experimental: testEnv.ExperimentalDaemon(),

 	})

 	discoveryBackend := "consul://consuladdr:consulport/some/path"

 	discoveryAdvertise := "1.1.1.1:2375"

@@ -91,7 +91,7 @@ func (s *DockerSuite) TestInfoDiscoveryInvalidAdvertise(c *check.C) {

 	testRequires(c, SameHostDaemon, DaemonIsLinux)

 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: experimentalDaemon,

+		Experimental: testEnv.ExperimentalDaemon(),

 	})

 	discoveryBackend := "consul://consuladdr:consulport/some/path"

@@ -110,7 +110,7 @@ func (s *DockerSuite) TestInfoDiscoveryAdvertiseInterfaceName(c *check.C) {

 	testRequires(c, SameHostDaemon, Network, DaemonIsLinux)

 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: experimentalDaemon,

+		Experimental: testEnv.ExperimentalDaemon(),

 	})

 	discoveryBackend := "consul://consuladdr:consulport/some/path"

 	discoveryAdvertise := "eth0"

@@ -177,7 +177,7 @@ func (s *DockerSuite) TestInfoDebug(c *check.C) {

 	testRequires(c, SameHostDaemon, DaemonIsLinux)

 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: experimentalDaemon,

+		Experimental: testEnv.ExperimentalDaemon(),

 	})

 	d.Start(c, "--debug")

 	defer d.Stop(c)

@@ -200,7 +200,7 @@ func (s *DockerSuite) TestInsecureRegistries(c *check.C) {

 	registryHost := "insecurehost.com:5000"

 	d := daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: experimentalDaemon,

+		Experimental: testEnv.ExperimentalDaemon(),

 	})

 	d.Start(c, "--insecure-registry="+registryCIDR, "--insecure-registry="+registryHost)

 	defer d.Stop(c)

@@ -53,7 +53,7 @@ func (s *DockerSuite) TestInspectDefault(c *check.C) {

 }

 func (s *DockerSuite) TestInspectStatus(c *check.C) {

-	if daemonPlatform != "windows" {

+	if testEnv.DaemonPlatform() != "windows" {

 		defer unpauseAllContainers(c)

 	}

 	out, _ := runSleepingContainer(c, "-d")

@@ -64,7 +64,7 @@ func (s *DockerSuite) TestInspectStatus(c *check.C) {

 	// Windows does not support pause/unpause on Windows Server Containers.

 	// (RS1 does for Hyper-V Containers, but production CI is not setup for that)

-	if daemonPlatform != "windows" {

+	if testEnv.DaemonPlatform() != "windows" {

 		dockerCmd(c, "pause", out)

 		inspectOut = inspectField(c, out, "State.Status")

 		c.Assert(inspectOut, checker.Equals, "paused")

@@ -209,7 +209,7 @@ func (s *DockerSuite) TestInspectContainerGraphDriver(c *check.C) {

 func (s *DockerSuite) TestInspectBindMountPoint(c *check.C) {

 	modifier := ",z"

 	prefix, slash := getPrefixAndSlashFromDaemonPlatform()

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		modifier = ""

 		// Linux creates the host directory if it doesn't exist. Windows does not.

 		os.Mkdir(`c:\data`, os.ModeDir)

@@ -232,7 +232,7 @@ func (s *DockerSuite) TestInspectBindMountPoint(c *check.C) {

 	c.Assert(m.Driver, checker.Equals, "")

 	c.Assert(m.Source, checker.Equals, prefix+slash+"data")

 	c.Assert(m.Destination, checker.Equals, prefix+slash+"data")

-	if daemonPlatform != "windows" { // Windows does not set mode

+	if testEnv.DaemonPlatform() != "windows" { // Windows does not set mode

 		c.Assert(m.Mode, checker.Equals, "ro"+modifier)

 	}

 	c.Assert(m.RW, checker.Equals, false)

@@ -49,7 +49,7 @@ type DockerNetworkSuite struct {

 func (s *DockerNetworkSuite) SetUpTest(c *check.C) {

 	s.d = daemon.New(c, dockerBinary, dockerdBinary, daemon.Config{

-		Experimental: experimentalDaemon,

+		Experimental: testEnv.ExperimentalDaemon(),

 	})

 }

@@ -47,7 +47,7 @@ func (s *DockerSuite) TestPluginBasicOps(c *check.C) {

 	c.Assert(err, checker.IsNil)

 	c.Assert(out, checker.Contains, pNameWithTag)

-	_, err = os.Stat(filepath.Join(dockerBasePath, "plugins", id))

+	_, err = os.Stat(filepath.Join(testEnv.DockerBasePath(), "plugins", id))

 	if !os.IsNotExist(err) {

 		c.Fatal(err)

 	}

@@ -213,7 +213,7 @@ func (s *DockerSuite) TestPsListContainersFilterStatus(c *check.C) {

 	})

 	// Windows doesn't support pausing of containers

-	if daemonPlatform != "windows" {

+	if testEnv.DaemonPlatform() != "windows" {

 		// pause running container

 		out, _ = dockerCmd(c, "run", "-itd", "busybox")

 		pausedID := strings.TrimSpace(out)

@@ -104,7 +104,7 @@ func (s *DockerSuite) TestRenameAnonymousContainer(c *check.C) {

 	dockerCmd(c, "start", "container1")

 	count := "-c"

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		count = "-n"

 	}

@@ -253,7 +253,7 @@ func (s *DockerSuite) TestRestartContainerwithRestartPolicy(c *check.C) {

 	id1 := strings.TrimSpace(string(out1))

 	id2 := strings.TrimSpace(string(out2))

 	waitTimeout := 15 * time.Second

-	if daemonPlatform == "windows" {

+	if testEnv.DaemonPlatform() == "windows" {

 		waitTimeout = 150 * time.Second

 	}

 	err := waitInspect(id1, "{{ .State.Restarting }} {{ .State.Running }}", "false false", waitTimeout)

@@ -67,7 +67,7 @@ func (s *DockerSuite) TestRmiImgIDMultipleTag(c *check.C) {

 	// Wait for it to exit as cannot commit a running container on Windows, and

 	// it will take a few seconds to exit