new file mode 100644

@@ -0,0 +1,70 @@

+## Step 1: Build tests

+FROM golang:1.8.3-alpine3.6 as builder

+

+RUN apk add --update \

+    bash \

+    build-base \

+    curl \

+    lvm2-dev \

+    jq \

+    && rm -rf /var/cache/apk/*

+

+RUN mkdir -p /go/src/github.com/docker/docker/

+WORKDIR /go/src/github.com/docker/docker/

+

+# Generate frozen images

+COPY contrib/download-frozen-image-v2.sh contrib/download-frozen-image-v2.sh

+RUN contrib/download-frozen-image-v2.sh /output/docker-frozen-images \

+  buildpack-deps:jessie@sha256:85b379ec16065e4fe4127eb1c5fb1bcc03c559bd36dbb2e22ff496de55925fa6 \

+  busybox:latest@sha256:32f093055929dbc23dec4d03e09dfe971f5973a9ca5cf059cbfb644c206aa83f \

+  debian:jessie@sha256:72f784399fd2719b4cb4e16ef8e369a39dc67f53d978cd3e2e7bf4e502c7b793 \

+  hello-world:latest@sha256:c5515758d4c5e1e838e9cd307f6c6a0d620b5e07e6f927b07d05f6d12a1ac8d7

+

+# Download Docker CLI binary

+COPY hack/dockerfile hack/dockerfile

+RUN hack/dockerfile/install-binaries.sh dockercli

+

+# Set tag and add sources

+ARG DOCKER_GITCOMMIT

+ENV DOCKER_GITCOMMIT=$DOCKER_GITCOMMIT

+ADD . .

+

+# Build DockerSuite.TestBuild* dependency

+RUN CGO_ENABLED=0 go build -o /output/httpserver github.com/docker/docker/contrib/httpserver

+

+# Build the integration tests and copy the resulting binaries to /output/tests

+RUN hack/make.sh build-integration-test-binary

+RUN mkdir -p /output/tests && find . -name test.main -exec cp --parents '{}' /output/tests \;

+

+## Step 2: Generate testing image

+FROM alpine:3.6 as runner

+

+# GNU tar is used for generating the emptyfs image

+RUN apk add --update \

+    bash \

+    ca-certificates \

+    g++ \

+    git \

+    iptables \

+    tar \

+    xz \

+    && rm -rf /var/cache/apk/*

+

+# Add an unprivileged user to be used for tests which need it

+RUN addgroup docker && adduser -D -G docker unprivilegeduser -s /bin/ash

+

+COPY contrib/httpserver/Dockerfile /tests/contrib/httpserver/Dockerfile

+COPY contrib/syscall-test /tests/contrib/syscall-test

+COPY integration-cli/fixtures /tests/integration-cli/fixtures

+

+COPY hack/test/e2e-run.sh /scripts/run.sh

+COPY hack/make/.ensure-emptyfs /scripts/ensure-emptyfs.sh

+

+COPY --from=builder /output/docker-frozen-images /docker-frozen-images

+COPY --from=builder /output/httpserver /tests/contrib/httpserver/httpserver

+COPY --from=builder /output/tests /tests

+COPY --from=builder /usr/local/bin/docker /usr/bin/docker

+

+ENV DOCKER_REMOTE_DAEMON=1 DOCKER_INTEGRATION_DAEMON_DEST=/

+

+ENTRYPOINT ["/scripts/run.sh"]

new file mode 100755

@@ -0,0 +1,41 @@

+#!/usr/bin/env bash

+set -e

+

+TESTFLAGS=${TESTFLAGS:-""}

+# Currently only DockerSuite and DockerNetworkSuite have been adapted for E2E testing

+TESTFLAGS_LEGACY=${TESTFLAGS_LEGACY:-""}

+TIMEOUT=${TIMEOUT:-60m}

+

+SCRIPTDIR="$(dirname ${BASH_SOURCE[0]})"

+

+export DOCKER_ENGINE_GOARCH=${DOCKER_ENGINE_GOARCH:-amd64}

+

+run_test_integration() {

+  run_test_integration_suites

+  run_test_integration_legacy_suites

+}

+

+run_test_integration_suites() {

+  local flags="-test.v -test.timeout=${TIMEOUT} $TESTFLAGS"

+  for dir in /tests/integration/*; do

+    if ! (

+      cd $dir

+      echo "Running $PWD"

+      ./test.main $flags

+    ); then exit 1; fi

+  done

+}

+

+run_test_integration_legacy_suites() {

+  (

+    flags="-check.v -check.timeout=${TIMEOUT} -test.timeout=360m $TESTFLAGS_LEGACY"

+    cd /tests/integration-cli

+    echo "Running $PWD"

+    ./test.main $flags

+  )

+}

+

+bash $SCRIPTDIR/ensure-emptyfs.sh

+

+echo "Run integration tests"

+run_test_integration

@@ -67,7 +67,7 @@ func TestMain(m *testing.M) {

 func Test(t *testing.T) {

 	cli.SetTestEnvironment(testEnv)

 	fakestorage.SetTestEnvironment(&testEnv.Execution)

-	ienv.ProtectImages(t, &testEnv.Execution)

+	ienv.ProtectAll(t, &testEnv.Execution)

 	check.TestingT(t)

 }

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

 }

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

-	testRequires(c, DaemonIsLinux, registry.Hosting)

+	testRequires(c, DaemonIsLinux, registry.Hosting, SameHostDaemon)

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

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

 		Experimental: testEnv.ExperimentalDaemon(),

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

 }

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

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

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

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

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

 		Experimental: testEnv.ExperimentalDaemon(),

@@ -188,7 +188,7 @@ func (s *DockerRegistryAuthHtpasswdSuite) OnTimeout(c *check.C) {

 }

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

-	testRequires(c, DaemonIsLinux, registry.Hosting)

+	testRequires(c, DaemonIsLinux, registry.Hosting, SameHostDaemon)

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

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

 		Experimental: testEnv.ExperimentalDaemon(),

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

 }

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

-	testRequires(c, DaemonIsLinux, registry.Hosting)

+	testRequires(c, DaemonIsLinux, registry.Hosting, SameHostDaemon)

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

 		Experimental: testEnv.ExperimentalDaemon(),

 	})

@@ -319,7 +319,7 @@ func (s *DockerSwarmSuite) OnTimeout(c *check.C) {

 }

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

-	testRequires(c, DaemonIsLinux)

+	testRequires(c, DaemonIsLinux, SameHostDaemon)

 }

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

@@ -471,7 +471,7 @@ func (ps *DockerPluginSuite) getPluginRepoWithTag() string {

 }

 func (ps *DockerPluginSuite) SetUpSuite(c *check.C) {

-	testRequires(c, DaemonIsLinux)

+	testRequires(c, DaemonIsLinux, registry.Hosting)

 	ps.registry = setupRegistry(c, false, "", "")

 	ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)

@@ -39,27 +39,34 @@ func ensureHTTPServerImage(t testingT) {

 		goarch = "amd64"

 	}

-	goCmd, lookErr := exec.LookPath("go")

+	cpCmd, lookErr := exec.LookPath("cp")

 	if lookErr != nil {

 		t.Fatalf("could not build http server: %v", lookErr)

 	}

-	cmd := exec.Command(goCmd, "build", "-o", filepath.Join(tmp, "httpserver"), "github.com/docker/docker/contrib/httpserver")

-	cmd.Env = append(os.Environ(), []string{

-		"CGO_ENABLED=0",

-		"GOOS=" + goos,

-		"GOARCH=" + goarch,

-	}...)

-	var out []byte

-	if out, err = cmd.CombinedOutput(); err != nil {

-		t.Fatalf("could not build http server: %s", string(out))

-	}

+	if _, err = os.Stat("../contrib/httpserver/httpserver"); os.IsNotExist(err) {

+		goCmd, lookErr := exec.LookPath("go")

+		if lookErr != nil {

+			t.Fatalf("could not build http server: %v", lookErr)

+		}

-	cpCmd, lookErr := exec.LookPath("cp")

-	if lookErr != nil {

-		t.Fatalf("could not build http server: %v", lookErr)

+		cmd := exec.Command(goCmd, "build", "-o", filepath.Join(tmp, "httpserver"), "github.com/docker/docker/contrib/httpserver")

+		cmd.Env = append(os.Environ(), []string{

+			"CGO_ENABLED=0",

+			"GOOS=" + goos,

+			"GOARCH=" + goarch,

+		}...)

+		var out []byte

+		if out, err = cmd.CombinedOutput(); err != nil {

+			t.Fatalf("could not build http server: %s", string(out))

+		}

+	} else {

+		if out, err := exec.Command(cpCmd, "../contrib/httpserver/httpserver", filepath.Join(tmp, "httpserver")).CombinedOutput(); err != nil {

+			t.Fatalf("could not copy http server: %v", string(out))

+		}

 	}

-	if out, err = exec.Command(cpCmd, "../contrib/httpserver/Dockerfile", filepath.Join(tmp, "Dockerfile")).CombinedOutput(); err != nil {

+

+	if out, err := exec.Command(cpCmd, "../contrib/httpserver/Dockerfile", filepath.Join(tmp, "Dockerfile")).CombinedOutput(); err != nil {

 		t.Fatalf("could not build http server: %v", string(out))

 	}

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

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

 	testRequires(c, NotUserNamespace)

+

 	var testD string

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

 		testD = `FROM busybox

@@ -71,7 +71,6 @@ func (s *DockerSuite) TestContainerAPIGetJSONNoFieldsOmitted(c *check.C) {

 	c.Assert(err, checker.IsNil)

 	c.Assert(containers, checker.HasLen, startCount+1)

 	actual := fmt.Sprintf("%+v", containers[0])

-	fmt.Println(actual)

 	// empty Labels field triggered this bug, make sense to check for everything

 	// cause even Ports for instance can trigger this bug

@@ -1372,8 +1371,7 @@ func (s *DockerSuite) TestContainerAPICreateNoHostConfig118(c *check.C) {

 		Image: "busybox",

 	}

-	var httpClient *http.Client

-	cli, err := client.NewClient(daemonHost(), "v1.18", httpClient, map[string]string{})

+	cli, err := request.NewEnvClientWithVersion("v1.18")

 	_, err = cli.ContainerCreate(context.Background(), &config, &containertypes.HostConfig{}, &networktypes.NetworkingConfig{}, "")

 	c.Assert(err, checker.IsNil)

@@ -1409,16 +1407,6 @@ func (s *DockerSuite) TestPutContainerArchiveErrSymlinkInVolumeToReadOnlyRootfs(

 	c.Assert(err.Error(), checker.Contains, "container rootfs is marked read-only")

 }

-func (s *DockerSuite) TestContainerAPIGetContainersJSONEmpty(c *check.C) {

-	cli, err := client.NewEnvClient()

-	c.Assert(err, checker.IsNil)

-	defer cli.Close()

-

-	containers, err := cli.ContainerList(context.Background(), types.ContainerListOptions{All: true})

-	c.Assert(err, checker.IsNil)

-	c.Assert(containers, checker.HasLen, 0)

-}

-

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

 	// Not supported on Windows

 	testRequires(c, DaemonIsLinux)

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

 }

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

-	testRequires(c, Network)

+	testRequires(c, Network, SameHostDaemon)

 	server := httptest.NewServer(http.NewServeMux())

 	defer server.Close()

@@ -179,8 +179,7 @@ func (s *DockerSuite) TestAPIImagesSizeCompatibility(c *check.C) {

 		Labels      map[string]string

 	}

-	var httpClient *http.Client

-	cli, err = client.NewClient(daemonHost(), "v1.24", httpClient, nil)

+	cli, err = request.NewEnvClientWithVersion("v1.24")

 	c.Assert(err, checker.IsNil)

 	defer cli.Close()

@@ -4,10 +4,9 @@ package main

 import (

 	"encoding/json"

-	"net/http"

-	"github.com/docker/docker/client"

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

+	"github.com/docker/docker/integration-cli/request"

 	"github.com/go-check/check"

 	"golang.org/x/net/context"

 )

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

 	name := "cpusetinconfig-pre120"

 	dockerCmd(c, "run", "--name", name, "--cpuset-cpus", "0", "busybox", "true")

-	var httpClient *http.Client

-	cli, err := client.NewClient(daemonHost(), "v1.19", httpClient, nil)

+	cli, err := request.NewEnvClientWithVersion("v1.19")

 	c.Assert(err, checker.IsNil)

 	defer cli.Close()

 	_, body, err := cli.ContainerInspectWithRaw(context.Background(), name, false)

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

 	c.Assert(nr.Name, checker.Equals, "bridge")

 }

-func (s *DockerSuite) TestAPINetworkInspect(c *check.C) {

+func (s *DockerSuite) TestAPINetworkInspectBridge(c *check.C) {

 	testRequires(c, DaemonIsLinux)

 	// Inspect default bridge network

 	nr := getNetworkResource(c, "bridge")

@@ -94,13 +94,15 @@ func (s *DockerSuite) TestAPINetworkInspect(c *check.C) {

 	c.Assert(nr.Internal, checker.Equals, false)

 	c.Assert(nr.EnableIPv6, checker.Equals, false)

 	c.Assert(nr.IPAM.Driver, checker.Equals, "default")

-	c.Assert(len(nr.Containers), checker.Equals, 1)

 	c.Assert(nr.Containers[containerID], checker.NotNil)

 	ip, _, err := net.ParseCIDR(nr.Containers[containerID].IPv4Address)

 	c.Assert(err, checker.IsNil)

 	c.Assert(ip.String(), checker.Equals, containerIP)

+}

+func (s *DockerSuite) TestAPINetworkInspectUserDefinedNetwork(c *check.C) {

+	testRequires(c, DaemonIsLinux)

 	// IPAM configuration inspect

 	ipam := &network.IPAM{

 		Driver: "default",

@@ -117,7 +119,7 @@ func (s *DockerSuite) TestAPINetworkInspect(c *check.C) {

 	id0 := createNetwork(c, config, true)

 	c.Assert(isNetworkAvailable(c, "br0"), checker.Equals, true)

-	nr = getNetworkResource(c, id0)

+	nr := getNetworkResource(c, id0)

 	c.Assert(len(nr.IPAM.Config), checker.Equals, 1)

 	c.Assert(nr.IPAM.Config[0].Subnet, checker.Equals, "172.28.0.0/16")

 	c.Assert(nr.IPAM.Config[0].IPRange, checker.Equals, "172.28.5.0/24")

@@ -291,9 +293,16 @@ func getNetworkIDByName(c *check.C, name string) string {

 	nJSON := []types.NetworkResource{}

 	err = json.NewDecoder(body).Decode(&nJSON)

 	c.Assert(err, checker.IsNil)

-	c.Assert(len(nJSON), checker.Equals, 1)

+	var res string

+	for _, n := range nJSON {

+		// Find exact match

+		if n.Name == name {

+			res = n.ID

+		}

+	}

+	c.Assert(res, checker.Not(checker.Equals), "")

-	return nJSON[0].ID

+	return res

 }

 func getNetworkResource(c *check.C, id string) *types.NetworkResource {

@@ -16,16 +16,27 @@ import (

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

 	prefix, _ := getPrefixAndSlashFromDaemonPlatform()

-	dockerCmd(c, "run", "-v", prefix+"/foo", "busybox")

+	cid, _ := dockerCmd(c, "run", "-d", "-v", prefix+"/foo", "busybox")

 	cli, err := client.NewEnvClient()

 	c.Assert(err, checker.IsNil)

 	defer cli.Close()

+	container, err := cli.ContainerInspect(context.Background(), strings.TrimSpace(cid))

+	c.Assert(err, checker.IsNil)

+	vname := container.Mounts[0].Name

+

 	volumes, err := cli.VolumeList(context.Background(), filters.Args{})

 	c.Assert(err, checker.IsNil)

-	c.Assert(len(volumes.Volumes), checker.Equals, 1, check.Commentf("\n%v", volumes.Volumes))

+	found := false

+	for _, vol := range volumes.Volumes {

+		if vol.Name == vname {

+			found = true

+			break

+		}

+	}

+	c.Assert(found, checker.Equals, true)

 }

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

@@ -45,21 +56,21 @@ func (s *DockerSuite) TestVolumesAPICreate(c *check.C) {

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

 	prefix, _ := getPrefixAndSlashFromDaemonPlatform()

-	dockerCmd(c, "run", "-v", prefix+"/foo", "--name=test", "busybox")

+	cid, _ := dockerCmd(c, "run", "-d", "-v", prefix+"/foo", "--name=test", "busybox")

 	cli, err := client.NewEnvClient()

 	c.Assert(err, checker.IsNil)

 	defer cli.Close()

-	volumes, err := cli.VolumeList(context.Background(), filters.Args{})

+	container, err := cli.ContainerInspect(context.Background(), strings.TrimSpace(cid))

 	c.Assert(err, checker.IsNil)

+	vname := container.Mounts[0].Name

-	v := volumes.Volumes[0]

-	err = cli.VolumeRemove(context.Background(), v.Name, false)

+	err = cli.VolumeRemove(context.Background(), vname, false)

 	c.Assert(err.Error(), checker.Contains, "volume is in use")

 	dockerCmd(c, "rm", "-f", "test")

-	err = cli.VolumeRemove(context.Background(), v.Name, false)

+	err = cli.VolumeRemove(context.Background(), vname, false)

 	c.Assert(err, checker.IsNil)

 }

@@ -78,10 +89,6 @@ func (s *DockerSuite) TestVolumesAPIInspect(c *check.C) {

 	_, err = cli.VolumeCreate(context.Background(), config)

 	c.Assert(err, check.IsNil)

-	volumes, err := cli.VolumeList(context.Background(), filters.Args{})

-	c.Assert(err, checker.IsNil)

-	c.Assert(len(volumes.Volumes), checker.Equals, 1, check.Commentf("\n%v", volumes.Volumes))

-

 	vol, err := cli.VolumeInspect(context.Background(), config.Name)

 	c.Assert(err, checker.IsNil)

 	c.Assert(vol.Name, checker.Equals, config.Name)

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

 	c.Assert(running, checker.Equals, "true", check.Commentf("expected container to still be running"))

 	go func() {

-		dockerCmd(c, "kill", id)

+		dockerCmdWithResult("kill", id)

 	}()

 	select {

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

 	c.Assert(running, checker.Equals, "true", check.Commentf("expected container to still be running"))

 	go func() {

-		dockerCmd(c, "kill", id)

+		dockerCmdWithResult("kill", id)

 	}()

 	select {

@@ -4,7 +4,6 @@ package main

 import (

 	"fmt"

-	"strings"

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

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

@@ -31,7 +30,7 @@ type DockerAuthzV2Suite struct {

 }

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

-	testRequires(c, DaemonIsLinux, Network)

+	testRequires(c, DaemonIsLinux, Network, SameHostDaemon)

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

 		Experimental: testEnv.ExperimentalDaemon(),

 	})

@@ -47,6 +46,7 @@ func (s *DockerAuthzV2Suite) TearDownTest(c *check.C) {

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

 	testRequires(c, DaemonIsLinux, IsAmd64, Network)

+

 	// Install authz plugin

 	_, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", authzPluginNameWithTag)

 	c.Assert(err, checker.IsNil)

@@ -65,14 +65,8 @@ func (s *DockerAuthzV2Suite) TestAuthZPluginAllowNonVolumeRequest(c *check.C) {

 	}()

 	// Ensure docker run command and accompanying docker ps are successful

-	out, err := s.d.Cmd("run", "-d", "busybox", "top")

-	c.Assert(err, check.IsNil)

-

-	id := strings.TrimSpace(out)

-

-	out, err = s.d.Cmd("ps")

+	_, err = s.d.Cmd("run", "-d", "busybox", "top")

 	c.Assert(err, check.IsNil)

-	c.Assert(assertContainerList(out, []string{id}), check.Equals, true)

 }

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

@@ -64,6 +64,7 @@ type authorizationController struct {

 }

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

+	testRequires(c, SameHostDaemon)

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

 		Experimental: testEnv.ExperimentalDaemon(),

 	})

@@ -218,12 +219,6 @@ func (s *DockerAuthzSuite) TestAuthZPluginAllowRequest(c *check.C) {

 	id := strings.TrimSpace(out)

 	assertURIRecorded(c, s.ctrl.requestsURIs, "/containers/create")

 	assertURIRecorded(c, s.ctrl.requestsURIs, fmt.Sprintf("/containers/%s/start", id))

-

-	out, err = s.d.Cmd("ps")

-	c.Assert(err, check.IsNil)

-	c.Assert(assertContainerList(out, []string{id}), check.Equals, true)

-	c.Assert(s.ctrl.psRequestCnt, check.Equals, 1)

-	c.Assert(s.ctrl.psResponseCnt, check.Equals, 1)

 }

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

@@ -27,17 +27,18 @@ import (

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

 	testRequires(c, cpuCfsQuota)

 	name := "testbuildresourceconstraints"

+	buildLabel := "DockerSuite.TestBuildResourceConstraintsAreUsed"

 	ctx := fakecontext.New(c, "", fakecontext.WithDockerfile(`

 	FROM hello-world:frozen

 	RUN ["/hello"]

 	`))

 	cli.Docker(

-		cli.Args("build", "--no-cache", "--rm=false", "--memory=64m", "--memory-swap=-1", "--cpuset-cpus=0", "--cpuset-mems=0", "--cpu-shares=100", "--cpu-quota=8000", "--ulimit", "nofile=42", "-t", name, "."),

+		cli.Args("build", "--no-cache", "--rm=false", "--memory=64m", "--memory-swap=-1", "--cpuset-cpus=0", "--cpuset-mems=0", "--cpu-shares=100", "--cpu-quota=8000", "--ulimit", "nofile=42", "--label="+buildLabel, "-t", name, "."),

 		cli.InDir(ctx.Dir),

 	).Assert(c, icmd.Success)

-	out := cli.DockerCmd(c, "ps", "-lq").Combined()

+	out := cli.DockerCmd(c, "ps", "-lq", "--filter", "label="+buildLabel).Combined()

 	cID := strings.TrimSpace(out)

 	type hostConfig struct {

@@ -407,6 +407,8 @@ func (s *DockerRegistrySuite) TestInspectImageWithDigests(c *check.C) {

 }

 func (s *DockerRegistrySuite) TestPsListContainersFilterAncestorImageByDigest(c *check.C) {

+	existingContainers := ExistingContainerIDs(c)

+

 	digest, err := setupImage(c)

 	c.Assert(err, checker.IsNil, check.Commentf("error setting up image"))

@@ -438,7 +440,7 @@ func (s *DockerRegistrySuite) TestPsListContainersFilterAncestorImageByDigest(c

 	// Valid imageReference

 	out, _ = dockerCmd(c, "ps", "-a", "-q", "--no-trunc", "--filter=ancestor="+imageReference)

-	checkPsAncestorFilterOutput(c, out, imageReference, expectedIDs)

+	checkPsAncestorFilterOutput(c, RemoveOutputForExistingElements(out, existingContainers), imageReference, expectedIDs)

 }

 func (s *DockerRegistrySuite) TestDeleteImageByIDOnlyPulledByDigest(c *check.C) {

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

 )

 func (s *DockerSwarmSuite) TestConfigList(c *check.C) {

+	testRequires(c, SameHostDaemon)

 	d := s.AddDaemon(c, true, true)

 	testName0 := "test0"

@@ -50,6 +50,7 @@ type DockerExternalVolumeSuite struct {

 }

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

+	testRequires(c, SameHostDaemon)

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

 		Experimental: testEnv.ExperimentalDaemon(),

 	})

@@ -39,6 +39,8 @@ func getHealth(c *check.C, name string) *types.Health {

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

 	testRequires(c, DaemonIsLinux) // busybox doesn't work on Windows

+	existingContainers := ExistingContainerIDs(c)

+

 	imageName := "testhealth"

 	buildImageSuccessfully(c, imageName, build.WithDockerfile(`FROM busybox

 		RUN echo OK > /status

@@ -49,9 +51,10 @@ func (s *DockerSuite) TestHealth(c *check.C) {

 	// No health status before starting

 	name := "test_health"

-	dockerCmd(c, "create", "--name", name, imageName)

-	out, _ := dockerCmd(c, "ps", "-a", "--format={{.Status}}")

-	c.Check(out, checker.Equals, "Created\n")

+	cid, _ := dockerCmd(c, "create", "--name", name, imageName)

+	out, _ := dockerCmd(c, "ps", "-a", "--format={{.ID}} {{.Status}}")

+	out = RemoveOutputForExistingElements(out, existingContainers)

+	c.Check(out, checker.Equals, cid[:12]+" Created\n")

 	// Inspect the options

 	out, _ = dockerCmd(c, "inspect",

@@ -135,42 +135,48 @@ func (s *DockerSuite) TestInfoDiscoveryAdvertiseInterfaceName(c *check.C) {

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

 	testRequires(c, DaemonIsLinux)

+	existing := existingContainerStates(c)

+

 	dockerCmd(c, "run", "-d", "busybox", "top")

 	out, _ := dockerCmd(c, "info")

-	c.Assert(out, checker.Contains, fmt.Sprintf("Containers: %d\n", 1))

-	c.Assert(out, checker.Contains, fmt.Sprintf(" Running: %d\n", 1))

-	c.Assert(out, checker.Contains, fmt.Sprintf(" Paused: %d\n", 0))

-	c.Assert(out, checker.Contains, fmt.Sprintf(" Stopped: %d\n", 0))

+	c.Assert(out, checker.Contains, fmt.Sprintf("Containers: %d\n", existing["Containers"]+1))

+	c.Assert(out, checker.Contains, fmt.Sprintf(" Running: %d\n", existing["ContainersRunning"]+1))

+	c.Assert(out, checker.Contains, fmt.Sprintf(" Paused: %d\n", existing["ContainersPaused"]))

+	c.Assert(out, checker.Contains, fmt.Sprintf(" Stopped: %d\n", existing["ContainersStopped"]))

 }

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

 	testRequires(c, IsPausable)

+	existing := existingContainerStates(c)

+

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

 	cleanedContainerID := strings.TrimSpace(out)

 	dockerCmd(c, "pause", cleanedContainerID)

 	out, _ = dockerCmd(c, "info")

-	c.Assert(out, checker.Contains, fmt.Sprintf("Containers: %d\n", 1))

-	c.Assert(out, checker.Contains, fmt.Sprintf(" Running: %d\n", 0))

-	c.Assert(out, checker.Contains, fmt.Sprintf(" Paused: %d\n", 1))

-	c.Assert(out, checker.Contains, fmt.Sprintf(" Stopped: %d\n", 0))

+	c.Assert(out, checker.Contains, fmt.Sprintf("Containers: %d\n", existing["Containers"]+1))

+	c.Assert(out, checker.Contains, fmt.Sprintf(" Running: %d\n", existing["ContainersRunning"]))

+	c.Assert(out, checker.Contains, fmt.Sprintf(" Paused: %d\n", existing["ContainersPaused"]+1))

+	c.Assert(out, checker.Contains, fmt.Sprintf(" Stopped: %d\n", existing["ContainersStopped"]))

 }

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

 	testRequires(c, DaemonIsLinux)

+	existing := existingContainerStates(c)

+

 	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")

 	cleanedContainerID := strings.TrimSpace(out)

 	dockerCmd(c, "stop", cleanedContainerID)

 	out, _ = dockerCmd(c, "info")

-	c.Assert(out, checker.Contains, fmt.Sprintf("Containers: %d\n", 1))

-	c.Assert(out, checker.Contains, fmt.Sprintf(" Running: %d\n", 0))

-	c.Assert(out, checker.Contains, fmt.Sprintf(" Paused: %d\n", 0))

-	c.Assert(out, checker.Contains, fmt.Sprintf(" Stopped: %d\n", 1))

+	c.Assert(out, checker.Contains, fmt.Sprintf("Containers: %d\n", existing["Containers"]+1))

+	c.Assert(out, checker.Contains, fmt.Sprintf(" Running: %d\n", existing["ContainersRunning"]))

+	c.Assert(out, checker.Contains, fmt.Sprintf(" Paused: %d\n", existing["ContainersPaused"]))

+	c.Assert(out, checker.Contains, fmt.Sprintf(" Stopped: %d\n", existing["ContainersStopped"]+1))

 }

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

@@ -237,3 +243,16 @@ func (s *DockerDaemonSuite) TestInfoLabels(c *check.C) {

 	c.Assert(err, checker.IsNil)

 	c.Assert(out, checker.Contains, "WARNING: labels with duplicate keys and conflicting values have been deprecated")

 }

+

+func existingContainerStates(c *check.C) map[string]int {

+	out, _ := dockerCmd(c, "info", "--format", "{{json .}}")

+	var m map[string]interface{}

+	err := json.Unmarshal([]byte(out), &m)

+	c.Assert(err, checker.IsNil)

+	res := map[string]int{}

+	res["Containers"] = int(m["Containers"].(float64))

+	res["ContainersRunning"] = int(m["ContainersRunning"].(float64))

+	res["ContainersPaused"] = int(m["ContainersPaused"].(float64))

+	res["ContainersStopped"] = int(m["ContainersStopped"].(float64))

+	return res

+}

@@ -1,13 +1,12 @@

 package main

 import (

-	"net/http"

 	"strings"

 	"time"

-	"github.com/docker/docker/client"

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

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

+	"github.com/docker/docker/integration-cli/request"

 	"github.com/go-check/check"

 	"github.com/gotestyourself/gotestyourself/icmd"

 	"golang.org/x/net/context"

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

 	testRequires(c, DaemonIsLinux) // Windows only supports 1.25 or later

 	runSleepingContainer(c, "--name", "docker-kill-test-api", "-d")

 	dockerCmd(c, "stop", "docker-kill-test-api")

-	var httpClient *http.Client

-	cli, err := client.NewClient(daemonHost(), "v1.19", httpClient, nil)

+	cli, err := request.NewEnvClientWithVersion("v1.19")

 	c.Assert(err, check.IsNil)

 	defer cli.Close()

 	err = cli.ContainerKill(context.Background(), "docker-kill-test-api", "SIGKILL")

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

 	"net/http"

 	"net/http/httptest"

 	"os"

-	"path/filepath"

 	"strings"

 	"time"

@@ -288,39 +287,6 @@ func (s *DockerNetworkSuite) TestDockerNetworkLsDefault(c *check.C) {

 	}

 }

-func (s *DockerSuite) TestNetworkLsFormat(c *check.C) {

-	testRequires(c, DaemonIsLinux)

-	out, _ := dockerCmd(c, "network", "ls", "--format", "{{.Name}}")

-	lines := strings.Split(strings.TrimSpace(string(out)), "\n")

-

-	expected := []string{"bridge", "host", "none"}

-	var names []string

-	names = append(names, lines...)

-	c.Assert(expected, checker.DeepEquals, names, check.Commentf("Expected array with truncated names: %v, got: %v", expected, names))

-}

-

-func (s *DockerSuite) TestNetworkLsFormatDefaultFormat(c *check.C) {

-	testRequires(c, DaemonIsLinux)

-

-	config := `{

-		"networksFormat": "{{ .Name }} default"

-}`

-	d, err := ioutil.TempDir("", "integration-cli-")

-	c.Assert(err, checker.IsNil)

-	defer os.RemoveAll(d)

-

-	err = ioutil.WriteFile(filepath.Join(d, "config.json"), []byte(config), 0644)

-	c.Assert(err, checker.IsNil)

-

-	out, _ := dockerCmd(c, "--config", d, "network", "ls")

-	lines := strings.Split(strings.TrimSpace(string(out)), "\n")

-

-	expected := []string{"bridge default", "host default", "none default"}

-	var names []string

-	names = append(names, lines...)

-	c.Assert(expected, checker.DeepEquals, names, check.Commentf("Expected array with truncated names: %v, got: %v", expected, names))

-}

-

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

 	predefined := []string{"bridge", "host", "none", "default"}

 	for _, net := range predefined {

@@ -351,6 +317,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkRmPredefined(c *check.C) {

 }

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

+	testRequires(c, OnlyDefaultNetworks)

 	testNet := "testnet1"

 	testLabel := "foo"

 	testValue := "bar"

@@ -624,6 +591,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkConnectDisconnect(c *check.C) {

 }

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

+	testRequires(c, SameHostDaemon)

 	// test0 bridge network

 	dockerCmd(c, "network", "create", "--subnet=192.168.0.0/16", "test1")

 	assertNwIsAvailable(c, "test1")

@@ -664,6 +632,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkIPAMMultipleNetworks(c *check.C) {

 }

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

+	testRequires(c, SameHostDaemon)

 	// Create a bridge network using custom ipam driver

 	dockerCmd(c, "network", "create", "--ipam-driver", dummyIPAMDriver, "br0")

 	assertNwIsAvailable(c, "br0")

@@ -679,6 +648,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkCustomIPAM(c *check.C) {

 }

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

+	testRequires(c, SameHostDaemon)

 	// Create a bridge network using custom ipam driver and options

 	dockerCmd(c, "network", "create", "--ipam-driver", dummyIPAMDriver, "--ipam-opt", "opt1=drv1", "--ipam-opt", "opt2=drv2", "br0")

 	assertNwIsAvailable(c, "br0")

@@ -691,6 +661,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkIPAMOptions(c *check.C) {

 }

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

+	testRequires(c, SameHostDaemon)

 	// Create a network with null ipam driver

 	_, _, err := dockerCmdWithError("network", "create", "-d", dummyNetworkDriver, "--ipam-driver", "null", "test000")

 	c.Assert(err, check.IsNil)

@@ -796,6 +767,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkIPAMInvalidCombinations(c *check.C

 }

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

+	testRequires(c, SameHostDaemon)

 	dockerCmd(c, "network", "create", "-d", dummyNetworkDriver, "-o", "opt1=drv1", "-o", "opt2=drv2", "testopt")

 	assertNwIsAvailable(c, "testopt")

 	gopts := remoteDriverNetworkRequest.Options[netlabel.GenericData]

@@ -981,6 +953,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkLinkOnDefaultNetworkOnly(c *check.

 }

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

+	testRequires(c, SameHostDaemon)

 	// Verify exposed ports are present in ps output when running a container on

 	// a network managed by a driver which does not provide the default gateway

 	// for the container

@@ -1007,7 +980,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkOverlayPortMapping(c *check.C) {

 }

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

-	testRequires(c, DaemonIsLinux, NotUserNamespace)

+	testRequires(c, DaemonIsLinux, NotUserNamespace, SameHostDaemon)

 	dnd := "dnd"

 	did := "did"

@@ -1048,6 +1021,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkDriverUngracefulRestart(c *check.C

 }

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

+	testRequires(c, SameHostDaemon)

 	// Verify endpoint MAC address is correctly populated in container's network settings

 	nwn := "ov"

 	ctn := "bb"

@@ -1113,6 +1087,7 @@ func verifyContainerIsConnectedToNetworks(c *check.C, d *daemon.Daemon, cName st

 }

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

+	testRequires(c, SameHostDaemon)

 	cName := "bb"

 	nwList := []string{"nw1", "nw2", "nw3"}

@@ -1131,6 +1106,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkMultipleNetworksGracefulDaemonRest

 }

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

+	testRequires(c, SameHostDaemon)

 	cName := "cc"

 	nwList := []string{"nw1", "nw2", "nw3"}

@@ -1157,7 +1133,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkRunNetByID(c *check.C) {

 }

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

-	testRequires(c, DaemonIsLinux, NotUserNamespace)

+	testRequires(c, DaemonIsLinux, NotUserNamespace, SameHostDaemon)

 	s.d.StartWithBusybox(c)

 	// Run a few containers on host network

@@ -1283,6 +1259,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkRestartWithMultipleNetworks(c *che

 }

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

+	testRequires(c, SameHostDaemon)

 	dockerCmd(c, "network", "create", "test")

 	dockerCmd(c, "create", "--name=foo", "busybox", "top")

 	dockerCmd(c, "network", "connect", "test", "foo")

@@ -1810,7 +1787,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkDisconnectFromBridge(c *check.C) {

 // TestConntrackFlowsLeak covers the failure scenario of ticket: https://github.com/docker/docker/issues/8795

 // Validates that conntrack is correctly cleaned once a container is destroyed

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

-	testRequires(c, IsAmd64, DaemonIsLinux, Network)

+	testRequires(c, IsAmd64, DaemonIsLinux, Network, SameHostDaemon)

 	// Create a new network

 	cli.DockerCmd(c, "network", "create", "--subnet=192.168.10.0/24", "--gateway=192.168.10.1", "-o", "com.docker.network.bridge.host_binding_ipv4=192.168.10.1", "testbind")

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

 	"net"

 	"regexp"