@@ -19,9 +19,9 @@ import (

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

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

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

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

 	testdaemon "github.com/docker/docker/internal/test/daemon"

 	ienv "github.com/docker/docker/internal/test/environment"

+	"github.com/docker/docker/internal/test/fixtures/plugin"

 	"github.com/docker/docker/internal/test/registry"

 	"github.com/docker/docker/pkg/reexec"

 	"github.com/go-check/check"

@@ -14,8 +14,8 @@ import (

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

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

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

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

 	testdaemon "github.com/docker/docker/internal/test/daemon"

+	"github.com/docker/docker/internal/test/fixtures/plugin"

 	"github.com/docker/docker/internal/test/registry"

 	"github.com/go-check/check"

 	"golang.org/x/net/context"

@@ -14,7 +14,7 @@ import (

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

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

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

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

+	"github.com/docker/docker/internal/test/fixtures/plugin"

 	"github.com/go-check/check"

 	"golang.org/x/net/context"

 )

@@ -332,7 +332,7 @@ func listTar(f io.Reader) ([]string, error) {

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

 	testRequires(c, DaemonIsLinux)

-	dockerCmd(c, "load", "-i", "fixtures/load/emptyLayer.tar")

+	dockerCmd(c, "load", "-i", "testdata/emptyLayer.tar")

 }

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

deleted file mode 100644

@@ -1,9 +0,0 @@

-

-version: "3"

-services:

-  web:

-    image: busybox@sha256:e4f93f6ed15a0cdd342f5aae387886fba0ab98af0a102da6276eaf24d6e6ade0

-    command: top

-  db:

-    image: busybox@sha256:e4f93f6ed15a0cdd342f5aae387886fba0ab98af0a102da6276eaf24d6e6ade0

-    command: "tail -f /dev/null"

deleted file mode 100644

@@ -1,11 +0,0 @@

-

-version: "3.1"

-services:

-  web:

-    image: busybox:latest

-    command: top

-    secrets:

-      - special

-secrets:

-  special:

-    file: fixtures/secrets/default

deleted file mode 100644

@@ -1,20 +0,0 @@

-

-version: "3.1"

-services:

-  web:

-    image: busybox@sha256:e4f93f6ed15a0cdd342f5aae387886fba0ab98af0a102da6276eaf24d6e6ade0

-    command: top

-    secrets:

-      - special

-      - source: super

-        target: foo.txt

-        mode: 0400

-      - star

-secrets:

-  special:

-    file: fixtures/secrets/default

-  super:

-    file: fixtures/secrets/default

-  star:

-    external:

-      name: outside

deleted file mode 100644

Binary files a/integration-cli/fixtures/load/emptyLayer.tar and /dev/null differ

deleted file mode 100644

@@ -1,197 +0,0 @@

-package load // import "github.com/docker/docker/integration-cli/fixtures/load"

-

-import (

-	"bufio"

-	"bytes"

-	"os"

-	"os/exec"

-	"path/filepath"

-	"strings"

-	"sync"

-

-	"context"

-

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

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

-	"github.com/docker/docker/pkg/jsonmessage"

-	"github.com/docker/docker/pkg/term"

-	"github.com/pkg/errors"

-)

-

-const frozenImgDir = "/docker-frozen-images"

-

-// FrozenImagesLinux loads the frozen image set for the integration suite

-// If the images are not available locally it will download them

-// TODO: This loads whatever is in the frozen image dir, regardless of what

-// images were passed in. If the images need to be downloaded, then it will respect

-// the passed in images

-func FrozenImagesLinux(client client.APIClient, images ...string) error {

-	var loadImages []struct{ srcName, destName string }

-	for _, img := range images {

-		if !imageExists(client, img) {

-			srcName := img

-			// hello-world:latest gets re-tagged as hello-world:frozen

-			// there are some tests that use hello-world:latest specifically so it pulls

-			// the image and hello-world:frozen is used for when we just want a super

-			// small image

-			if img == "hello-world:frozen" {

-				srcName = "hello-world:latest"

-			}

-			loadImages = append(loadImages, struct{ srcName, destName string }{

-				srcName:  srcName,

-				destName: img,

-			})

-		}

-	}

-	if len(loadImages) == 0 {

-		// everything is loaded, we're done

-		return nil

-	}

-

-	ctx := context.Background()

-	fi, err := os.Stat(frozenImgDir)

-	if err != nil || !fi.IsDir() {

-		srcImages := make([]string, 0, len(loadImages))

-		for _, img := range loadImages {

-			srcImages = append(srcImages, img.srcName)

-		}

-		if err := pullImages(ctx, client, srcImages); err != nil {

-			return errors.Wrap(err, "error pulling image list")

-		}

-	} else {

-		if err := loadFrozenImages(ctx, client); err != nil {

-			return err

-		}

-	}

-

-	for _, img := range loadImages {

-		if img.srcName != img.destName {

-			if err := client.ImageTag(ctx, img.srcName, img.destName); err != nil {

-				return errors.Wrapf(err, "failed to tag %s as %s", img.srcName, img.destName)

-			}

-			if _, err := client.ImageRemove(ctx, img.srcName, types.ImageRemoveOptions{}); err != nil {

-				return errors.Wrapf(err, "failed to remove %s", img.srcName)

-			}

-		}

-	}

-	return nil

-}

-

-func imageExists(client client.APIClient, name string) bool {

-	_, _, err := client.ImageInspectWithRaw(context.Background(), name)

-	return err == nil

-}

-

-func loadFrozenImages(ctx context.Context, client client.APIClient) error {

-	tar, err := exec.LookPath("tar")

-	if err != nil {

-		return errors.Wrap(err, "could not find tar binary")

-	}

-	tarCmd := exec.Command(tar, "-cC", frozenImgDir, ".")

-	out, err := tarCmd.StdoutPipe()

-	if err != nil {

-		return errors.Wrap(err, "error getting stdout pipe for tar command")

-	}

-

-	errBuf := bytes.NewBuffer(nil)

-	tarCmd.Stderr = errBuf

-	tarCmd.Start()

-	defer tarCmd.Wait()

-

-	resp, err := client.ImageLoad(ctx, out, true)

-	if err != nil {

-		return errors.Wrap(err, "failed to load frozen images")

-	}

-	defer resp.Body.Close()

-	fd, isTerminal := term.GetFdInfo(os.Stdout)

-	return jsonmessage.DisplayJSONMessagesStream(resp.Body, os.Stdout, fd, isTerminal, nil)

-}

-

-func pullImages(ctx context.Context, client client.APIClient, images []string) error {

-	cwd, err := os.Getwd()

-	if err != nil {

-		return errors.Wrap(err, "error getting path to dockerfile")

-	}

-	dockerfile := os.Getenv("DOCKERFILE")

-	if dockerfile == "" {

-		dockerfile = "Dockerfile"

-	}

-	dockerfilePath := filepath.Join(filepath.Dir(filepath.Clean(cwd)), dockerfile)

-	pullRefs, err := readFrozenImageList(dockerfilePath, images)

-	if err != nil {

-		return errors.Wrap(err, "error reading frozen image list")

-	}

-

-	var wg sync.WaitGroup

-	chErr := make(chan error, len(images))

-	for tag, ref := range pullRefs {

-		wg.Add(1)

-		go func(tag, ref string) {

-			defer wg.Done()

-			if err := pullTagAndRemove(ctx, client, ref, tag); err != nil {

-				chErr <- err

-				return

-			}

-		}(tag, ref)

-	}

-	wg.Wait()

-	close(chErr)

-	return <-chErr

-}

-

-func pullTagAndRemove(ctx context.Context, client client.APIClient, ref string, tag string) error {

-	resp, err := client.ImagePull(ctx, ref, types.ImagePullOptions{})

-	if err != nil {

-		return errors.Wrapf(err, "failed to pull %s", ref)

-	}

-	defer resp.Close()

-	fd, isTerminal := term.GetFdInfo(os.Stdout)

-	if err := jsonmessage.DisplayJSONMessagesStream(resp, os.Stdout, fd, isTerminal, nil); err != nil {

-		return err

-	}

-

-	if err := client.ImageTag(ctx, ref, tag); err != nil {

-		return errors.Wrapf(err, "failed to tag %s as %s", ref, tag)

-	}

-	_, err = client.ImageRemove(ctx, ref, types.ImageRemoveOptions{})

-	return errors.Wrapf(err, "failed to remove %s", ref)

-

-}

-

-func readFrozenImageList(dockerfilePath string, images []string) (map[string]string, error) {

-	f, err := os.Open(dockerfilePath)

-	if err != nil {

-		return nil, errors.Wrap(err, "error reading dockerfile")

-	}

-	defer f.Close()

-	ls := make(map[string]string)

-

-	scanner := bufio.NewScanner(f)

-	for scanner.Scan() {

-		line := strings.Fields(scanner.Text())

-		if len(line) < 3 {

-			continue

-		}

-		if !(line[0] == "RUN" && line[1] == "./contrib/download-frozen-image-v2.sh") {

-			continue

-		}

-

-		for scanner.Scan() {

-			img := strings.TrimSpace(scanner.Text())

-			img = strings.TrimSuffix(img, "\\")

-			img = strings.TrimSpace(img)

-			split := strings.Split(img, "@")

-			if len(split) < 2 {

-				break

-			}

-

-			for _, i := range images {

-				if split[0] == i {

-					ls[i] = img

-					break

-				}

-			}

-		}

-	}

-	return ls, nil

-}

deleted file mode 100644

@@ -1,21 +0,0 @@

-MIIDhTCCAm2gAwIBAgIJAP2EcMN2UXPcMA0GCSqGSIb3DQEBCwUAMFcxCzAJBgNV

-BAYTAlVTMQswCQYDVQQIEwJDQTEVMBMGA1UEBxMMU2FuRnJhbmNpc2NvMQ8wDQYD

-VQQKEwZEb2NrZXIxEzARBgNVBAMTCmRlbGVnYXRpb24wHhcNMTYwOTI4MTc0ODQ4

-WhcNMjYwNjI4MTc0ODQ4WjBXMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFTAT

-BgNVBAcTDFNhbkZyYW5jaXNjbzEPMA0GA1UEChMGRG9ja2VyMRMwEQYDVQQDEwpk

-ZWxlZ2F0aW9uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvgewhaYs

-Ke5s2AM7xxKrT4A6n7hW17qSnBjonCcPcwTFmYqIOdxWjYITgJuHrTwB4ZhBqWS7

-tTsUUu6hWLMeB7Uo5/GEQAAZspKkT9G/rNKF9lbWK9PPhGGkeR01c/Q932m92Hsn

-fCQ0Pp/OzD3nVTh0v9HKk+PObNMOCcqG87eYs4ylPRxs0RrE/rP+bEGssKQSbeCZ

-wazDnO+kiatVgKQZ2CK23iFdRE1z2rzqVDeaFWdvBqrRdWnkOZClhlLgEQ5nK2yV

-B6tSqOiI3MmHyHzIkGOQJp2/s7Pe0ckEkzsjTsJW8oKHlBBl6pRxHIKzNN4VFbeB

-vvYvrogrDrC/owIDAQABo1QwUjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIF

-oDATBgNVHSUEDDAKBggrBgEFBQcDAzAdBgNVHQ4EFgQUFoHfukRa6qGk1ncON64Z

-ASKlZdkwDQYJKoZIhvcNAQELBQADggEBAEq9Adpd03CPmpbRtTAJGAkjjLFr60sV

-2r+/l/m9R31ZCN9ymM9nxToQ8zfMdeAh/nnPcErziil2gDVqXueCNDkRj09tmDIE

-Q1Oc92uyNZNgcECow77cKZCTZSTku+qsJrYaykH5vSnia8ltcKj8inJedIcpBR+p

-608HEQvF0Eg5eaLPJwH48BCb0Gqdri1dJgrNnqptz7MDr8M+u7tHVulbAd3YxLlq

-JH1W2bkVUx6esbn/MUE5HL5iTuOYREEINvBSmLdmmFkampmCnCB/bDEyJeL9bAkt

-ZPIi0UNSnqFKLSP1Vf8AGLXt6iO7+1OGvtsDXEEYdXVOMsSXZtUuT7A=

deleted file mode 100644

@@ -1,27 +0,0 @@

-MIIEpAIBAAKCAQEAvgewhaYsKe5s2AM7xxKrT4A6n7hW17qSnBjonCcPcwTFmYqI

-OdxWjYITgJuHrTwB4ZhBqWS7tTsUUu6hWLMeB7Uo5/GEQAAZspKkT9G/rNKF9lbW

-K9PPhGGkeR01c/Q932m92HsnfCQ0Pp/OzD3nVTh0v9HKk+PObNMOCcqG87eYs4yl

-PRxs0RrE/rP+bEGssKQSbeCZwazDnO+kiatVgKQZ2CK23iFdRE1z2rzqVDeaFWdv

-BqrRdWnkOZClhlLgEQ5nK2yVB6tSqOiI3MmHyHzIkGOQJp2/s7Pe0ckEkzsjTsJW

-8oKHlBBl6pRxHIKzNN4VFbeBvvYvrogrDrC/owIDAQABAoIBAB/o8KZwsgfUhqh7

-WoViSCwQb0e0z7hoFwhpUl4uXPTGf1v6HEgDDPG0PwwgkdbwNaypQZVtWevj4NTQ

-R326jjdjH1xbfQa2PZpz722L3jDqJR6plEtFxRoIv3KrCffPsrgabIu2mnnJJpDB

-ixtW5cq0sT4ov2i4H0i85CWWwbSY/G/MHsvCuK9PhoCj9uToVqrf1KrAESE5q4fh

-mPSYUL99KVnj7SZkUz+79rc8sLLPVks3szZACMlm1n05ZTj/d6Nd2ZZUO45DllIj

-1XJghfWmnChrB/P/KYXgQ3Y9BofIAw1ra2y3wOZeqRFNsbmojcGldfdtN/iQzhEj

-uk4ThokCgYEA9FTmv36N8qSPWuqX/KzkixDQ8WrDGohcB54kK98Wx4ijXx3i38SY

-tFjO8YUS9GVo1+UgmRjZbzVX7xeum6+TdBBwOjNOxEQ4tzwiQBWDdGpli8BccdJ2

-OOIVxSslWhiUWfpYloXVetrR88iHbT882g795pbonDaJdXSLnij4UW8CgYEAxxrr

-QFpsmOEZvI/yPSOGdG7A1RIsCeH+cEOf4cKghs7+aCtAHlIweztNOrqirl3oKI1r

-I0zQl46WsaW8S/y99v9lmmnZbWwqLa4vIu0NWs0zaZdzKZw3xljMhgp4Ge69hHa2

-utCtAxcX+7q/yLlHoTiYwKdxX54iLkheCB8csw0CgYEAleEG820kkjXUIodJ2JwO

-Tihwo8dEC6CeI6YktizRgnEVFqH0rCOjMO5Rc+KX8AfNOrK5PnD54LguSuKSH7qi

-j04OKgWTSd43lF90+y63RtCFnibQDpp2HwrBJAQFk7EEP/XMJfnPLN/SbuMSADgM

-kg8kPTFRW5Iw3DYz9z9WpE0CgYAkn6/8Q2XMbUOFqti9JEa8Lg8sYk5VdwuNbPMA

-3QMYKQUk9ieyLB4c3Nik3+XCuyVUKEc31A5egmz3umu7cn8i6vGuiJ/k/8t2YZ7s

-Bry5Ihu95Yzab5DW3Eiqs0xKQN79ebS9AluAwQO5Wy2h52rknfuDHIm/M+BHsSoS

-xl5KFQKBgQCokCsYuX1z2GojHw369/R2aX3ovCGuHqy4k7fWxUrpHTHvth2+qNPr

-84qLJ9rLWoZE5sUiZ5YdwCgW877EdfkT+v4aaBX79ixso5VdqgJ/PdnoNntah/Vq

-njQiW1skn6/P5V/eyimN2n0VsyBr/zMDEtYTRP/Tb1zi/njFLQkZEA==

deleted file mode 100644

@@ -1,21 +0,0 @@

-MIIDhTCCAm2gAwIBAgIJAIq8naKlYAQfMA0GCSqGSIb3DQEBCwUAMFcxCzAJBgNV

-BAYTAlVTMQswCQYDVQQIEwJDQTEVMBMGA1UEBxMMU2FuRnJhbmNpc2NvMQ8wDQYD

-VQQKEwZEb2NrZXIxEzARBgNVBAMTCmRlbGVnYXRpb24wHhcNMTYwOTI4MTc0ODQ4

-WhcNMjYwNjI4MTc0ODQ4WjBXMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFTAT

-BgNVBAcTDFNhbkZyYW5jaXNjbzEPMA0GA1UEChMGRG9ja2VyMRMwEQYDVQQDEwpk

-ZWxlZ2F0aW9uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyY2EWYTW

-5VHipw08t675upmD6a+akiuZ1z+XpuOxZCgjZ0aHfoOe8wGKg3Ohz7UCBdD5Mob/

-L/qvRlsCaqPHGZKIyyX1HDO4mpuQQFBhYxt+ZAO3AaawEUOw2rwwMDEjLnDDTSZM

-z8jxCMvsJjBDqgb8g3z+AmjducQ/OH6llldgHIBY8ioRbROCL2PGgqywWq2fThav

-c70YMxtKviBGDNCouYeQ8JMK/PuLwPNDXNQAagFHVARXiUv/ILHk7ImYnSGJUcuk

-JTUGN2MBnpY0eakg7i+4za8sjjqOdn+2I6aVzlGJDSiRP72nkg/cE4BqMl9FrMwK

-9iS8xa9yMDLUvwIDAQABo1QwUjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIF

-oDATBgNVHSUEDDAKBggrBgEFBQcDAzAdBgNVHQ4EFgQUvQzzFmh3Sv3HcdExY3wx

-/1u6JLAwDQYJKoZIhvcNAQELBQADggEBAJcmDme2Xj/HPUPwaN/EyCmjhY73EiHO

-x6Pm16tscg5JGn5A+u3CZ1DmxUYl8Hp6MaW/sWzdtL0oKJg76pynadCWh5EacFR8

-u+2GV/IcN9mSX6JQzvrqbjSqo5/FehqBD+W5h3euwwApWA3STAadYeyEfmdOA3SQ

-W1vzrA1y7i8qgTqeJ7UX1sEAXlIhBK2zPYaMB+en+ZOiPyNxJYj6IDdGdD2paC9L

-6H9wKC+GAUTSdCWp89HP7ETSXEGr94AXkrwU+qNsiN+OyK8ke0EMngEPh5IQoplw

-/7zEZCth3oKxvR1/4S5LmTVaHI2ZlbU4q9bnY72G4tw8YQr2gcBGo4w=

deleted file mode 100644

@@ -1,27 +0,0 @@

-MIIEogIBAAKCAQEAyY2EWYTW5VHipw08t675upmD6a+akiuZ1z+XpuOxZCgjZ0aH

-foOe8wGKg3Ohz7UCBdD5Mob/L/qvRlsCaqPHGZKIyyX1HDO4mpuQQFBhYxt+ZAO3

-AaawEUOw2rwwMDEjLnDDTSZMz8jxCMvsJjBDqgb8g3z+AmjducQ/OH6llldgHIBY

-8ioRbROCL2PGgqywWq2fThavc70YMxtKviBGDNCouYeQ8JMK/PuLwPNDXNQAagFH

-VARXiUv/ILHk7ImYnSGJUcukJTUGN2MBnpY0eakg7i+4za8sjjqOdn+2I6aVzlGJ

-DSiRP72nkg/cE4BqMl9FrMwK9iS8xa9yMDLUvwIDAQABAoIBAHmffvzx7ydESWwa

-zcfdu26BkptiTvjjfJrqEd4wSewxWGPKqJqMXE8xX99A2KTZClZuKuH1mmnecQQY

-iRXGrK9ewFMuHYGeKEiLlPlqR8ohXhyGLVm+t0JDwaXMp5t9G0i73O5iLTm5fNGd

-FGxa9YnVW20Q8MqNczbVGH1D1zInhxzzOyFzBd4bBBJ8PdrUdyLpd7+RxY2ghnbT

-p9ZANR2vk5zmDLJgZx72n/u+miJWuhY6p0v3Vq4z/HHgdhf+K6vpDdzTcYlA0rO4

-c/c+RKED3ZadGUD5QoLsmEN0e3FVSMPN1kt4ZRTqWfH8f2X4mLz33aBryTjktP6+

-1rX6ThECgYEA74wc1Tq23B5R0/GaMm1AK3Ko2zzTD8wK7NSCElh2dls02B+GzrEB

-aE3A2GMQSuzb+EA0zkipwANBaqs3ZemH5G1pu4hstQsXCMd4jAJn0TmTXlplXBCf

-PSc8ZUU6XcJENRr9Q7O9/TGlgahX+z0ndxYx/CMCsSu7XsMg4IZsbAcCgYEA12Vb

-wKOVG15GGp7pMshr+2rQfVimARUP4gf3JnQmenktI4PfdnMW3a4L3DEHfLhIerwT

-6lRp/NpxSADmuT4h1UO1l2lc+gmTVPw0Vbl6VwHpgS5Kfu4ZyM6n3S66f/dE4nu7

-hQF9yZz7vn5Agghak4p6a1wC1gdMzR1tvxFzk4kCgYByBMTskWfcWeok8Yitm+bB

-R3Ar+kWT7VD97SCETusD5uG+RTNLSmEbHnc+B9kHcLo67YS0800pAeOvPBPARGnU

-RmffRU5I1iB+o0MzkSmNItSMQoagTaEd4IEUyuC/I+qHRHNsOC+kRm86ycAm67LP

-MhdUpe1wGxqyPjp15EXTHQKBgDKzFu+3EWfJvvKRKQ7dAh3BvKVkcl6a2Iw5l8Ej

-YdM+JpPPfI/i8yTmzL/dgoem0Nii4IUtrWzo9fUe0TAVId2S/HFRSaNJEbbVTnRH

-HjbQqmfPv5U08jjD+9siHp/0UfCFc1QRT8xe+RqTmReCY9+KntoaZEiAm2FEZgqt

-TukRAoGAf7QqbTP5/UH1KSkX89F5qy/6GS3pw6TLj9Ufm/l/NO8Um8gag6YhEKWR

-7HpkpCqjfWj8Av8ESR9cqddPGrbdqXFm9z7dCjlAd5T3Q3h/h+v+JzLQWbsI6WOb

-SsOSWNyE006ZZdIiFwO6GfxpLI24sVtYKgyob6Q71oxSqfnrnT0=

deleted file mode 100644

@@ -1,21 +0,0 @@

-MIIDhTCCAm2gAwIBAgIJAKHt/jxiWqMtMA0GCSqGSIb3DQEBCwUAMFcxCzAJBgNV

-BAYTAlVTMQswCQYDVQQIEwJDQTEVMBMGA1UEBxMMU2FuRnJhbmNpc2NvMQ8wDQYD

-VQQKEwZEb2NrZXIxEzARBgNVBAMTCmRlbGVnYXRpb24wHhcNMTYwOTI4MTc0ODQ5

-WhcNMjYwNjI4MTc0ODQ5WjBXMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFTAT

-BgNVBAcTDFNhbkZyYW5jaXNjbzEPMA0GA1UEChMGRG9ja2VyMRMwEQYDVQQDEwpk

-ZWxlZ2F0aW9uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqfbJk2Dk

-C9FJVjV2+Q2CQrJphG3vFc1Qlu9jgVA5RhGmF9jJzetsclsV/95nBhinIGcSmPQA

-l318G7Bz/cG/6O2n5+hj+S1+YOvQweReZj3d4kCeS86SOyLNTpMD9gsF0S8nR1RN

-h0jD4t1vxAVeGD1o61U8/k0O5eDoeOfOSWZagKk5PhyrMZgNip4IrG46umCkFlrw

-zMMcgQdwTQXywPqkr/LmYpqT1WpMlzHYTQEY8rKorIJQbPtHVYdr4UxYnNmk6fbU

-biEP1DQlwjBWcFTsDLqXKP/K+e3O0/e/hMB0y7Tj9fZ7Viw0t5IKXZPsxMhwknUT

-9vmPzIJO6NiniwIDAQABo1QwUjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIF

-oDATBgNVHSUEDDAKBggrBgEFBQcDAzAdBgNVHQ4EFgQUdTXRP1EzxQ+UDZSoheVo

-Mobud1cwDQYJKoZIhvcNAQELBQADggEBADV9asTWWdbmpkeRuKyi0xGho39ONK88

-xxkFlco766BVgemo/rGQj3oPuw6M6SzHFoJ6JUPjmLiAQDIGEU/2/b6LcOuLjP+4

-YejCcDTY3lSW/HMNoAmzr2foo/LngNGfe/qhVFUqV7GjFT9+XzFFBfIZ1cQiL2ed

-kc8rgQxFPwWXFCSwaENWeFnMDugkd+7xanoAHq8GsJpg5fTruDTmJkUqC2RNiMLn

-WM7QaqW7+lmUnMnc1IBoz0hFhgoiadWM/1RQxx51zTVw6Au1koIm4ZXu5a+/WyC8

-K1+HyUbc0AVaDaRBpRSOR9aHRwLGh6WQ4aUZQNyJroc999qfYrDEEV8=

deleted file mode 100644

@@ -1,27 +0,0 @@

-MIIEpQIBAAKCAQEAqfbJk2DkC9FJVjV2+Q2CQrJphG3vFc1Qlu9jgVA5RhGmF9jJ

-zetsclsV/95nBhinIGcSmPQAl318G7Bz/cG/6O2n5+hj+S1+YOvQweReZj3d4kCe

-S86SOyLNTpMD9gsF0S8nR1RNh0jD4t1vxAVeGD1o61U8/k0O5eDoeOfOSWZagKk5

-PhyrMZgNip4IrG46umCkFlrwzMMcgQdwTQXywPqkr/LmYpqT1WpMlzHYTQEY8rKo

-rIJQbPtHVYdr4UxYnNmk6fbUbiEP1DQlwjBWcFTsDLqXKP/K+e3O0/e/hMB0y7Tj

-9fZ7Viw0t5IKXZPsxMhwknUT9vmPzIJO6NiniwIDAQABAoIBAQCAr/ed3A2umO7T

-FDYZik3nXBiiiW4t7r+nGGgZ3/kNgY1lnuHlROxehXLZwbX1mrLnyML/BjhwezV9

-7ZNVPd6laVPpNj6DyxtWHRZ5yARlm1Al39E7CpQTrF0QsiWcpGnqIa62xjDRTpnq

-askV/Q5qggyvqmE9FnFCQpEiAjlhvp7F0kVHVJm9s3MK3zSyR0UTZ3cpYus2Jr2z

-OotHgAMHq5Hgb3dvxOeE2xRMeYAVDujbkNzXm2SddAtiRdLhWDh7JIr3zXhp0HyN

-4rLOyhlgz00oIGeDt/C0q3fRmghr3iZOG+7m2sUx0FD1Ru1dI9v2A+jYmIVNW6+x

-YJk5PzxJAoGBANDj7AGdcHSci/LDBPoTTUiz3uucAd27/IJma/iy8mdbVfOAb0Fy

-PRSPvoozlpZyOxg2J4eH/o4QxQR4lVKtnLKZLNHK2tg3LarwyBX1LiI3vVlB+DT1

-AmV8i5bJAckDhqFeEH5qdWZFi03oZsSXWEqX5iMYCrdK5lTZggcrFZeHAoGBANBL

-fkk3knAdcVfTYpmHx18GBi2AsCWTd20KD49YBdbVy0Y2Jaa1EJAmGWpTUKdYx40R

-H5CuGgcAviXQz3bugdTU1I3tAclBtpJNU7JkhuE+Epz0CM/6WERJrE0YxcGQA5ui

-6fOguFyiXD1/85jrDBOKy74aoS7lYz9r/a6eqmjdAoGBAJpm/nmrIAZx+Ff2ouUe

-A1Ar9Ch/Zjm5zEmu3zwzOU4AiyWz14iuoktifNq2iyalRNz+mnVpplToPFizsNwu

-C9dPtXtU0DJlhtIFrD/evLz6KnGhe4/ZUm4lgyBvb2xfuNHqL5Lhqelwmil6EQxb

-Oh3Y7XkfOjyFln89TwlxZUJdAoGAJRMa4kta7EvBTeGZLjyltvsqhFTghX+vBSCC

-ToBbYbbiHJgssXSPAylU4sD7nR3HPwuqM6VZip+OOMrm8oNXZpuPTce+xqTEq1vK

-JvmPrG3RAFDLdMFZjqYSXhKnuGE60yv3Ol8EEbDwfB3XLQPBPYU56Jdy0xcPSE2f

-dMJXEJ0CgYEAisZw0nXw6lFeYecu642EGuU0wv1O9i21p7eho9QwOcsoTl4Q9l+M

-M8iBv+qTHO+D19l4JbkGvy2H2diKoYduUFACcuiFYs8fjrT+4Z6DyOQAQGAf6Ylw

-BFbU15k6KbA9v4mZDfd1tY9x62L/XO55ZxYG+J+q0e26tEThgD8cEog=

deleted file mode 100644

@@ -1,21 +0,0 @@

-MIIDhTCCAm2gAwIBAgIJANae++ZkUEWMMA0GCSqGSIb3DQEBCwUAMFcxCzAJBgNV

-BAYTAlVTMQswCQYDVQQIEwJDQTEVMBMGA1UEBxMMU2FuRnJhbmNpc2NvMQ8wDQYD

-VQQKEwZEb2NrZXIxEzARBgNVBAMTCmRlbGVnYXRpb24wHhcNMTYwOTI4MTc0ODQ5

-WhcNMjYwNjI4MTc0ODQ5WjBXMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFTAT

-BgNVBAcTDFNhbkZyYW5jaXNjbzEPMA0GA1UEChMGRG9ja2VyMRMwEQYDVQQDEwpk

-ZWxlZ2F0aW9uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqULAjgba

-Y2I10WfqdmYnPfEqEe6iMDbzcgECb2xKafXcI4ltkQj1iO4zBTs0Ft9EzXFc5ZBh

-pTjZrL6vrIa0y/CH2BiIHBJ0wRHx/40HXp4DSj3HZpVOlEMI3npRfBGNIBllUaRN

-PWG7zL7DcKMIepBfPXyjBsxzH3yNiISq0W5hSiy+ImhSo3aipJUHHcp9Z9NgvpNC

-3QvnxsGKRnECmDRDlxkq+FQu9Iqs/HWFYWgyfcsw+YTrWZq3qVnnqUouHO//c9PG

-Ry3sZSDU97MwvkjvWys1e01Xvd3AbHx08YAsxih58i/OBKe81eD9NuZDP2KrjTxI

-5xkXKhj6DV2NnQIDAQABo1QwUjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIF

-oDATBgNVHSUEDDAKBggrBgEFBQcDAzAdBgNVHQ4EFgQUDt95hiqbQvi0KcvZGAUu

-VisnztQwDQYJKoZIhvcNAQELBQADggEBAGi7qHai7MWbfeu6SlXhzIP3AIMa8TMi

-lp/+mvPUFPswIVqYJ71MAN8uA7CTH3z50a2vYupGeOEtZqVJeRf+xgOEpwycncxp

-Qz6wc6TWPVIoT5q1Hqxw1RD2MyKL+Y+QBDYwFxFkthpDMlX48I9frcqoJUWFxBF2

-lnRr/cE7BbPE3sMbXV3wGPlH7+eUf+CgzXJo2HB6THzagyEgNrDiz/0rCQa1ipFd

-mNU3D/U6BFGmJNxhvSOtXX9escg8yjr05YwwzokHS2K4jE0ZuJPBd50C/Rvo3Mf4

-0h7/2Q95e7d42zPe9WYPu2F8KTWsf4r+6ddhKrKhYzXIcTAfHIOiO+U=

deleted file mode 100644

@@ -1,27 +0,0 @@

-MIIEpAIBAAKCAQEAqULAjgbaY2I10WfqdmYnPfEqEe6iMDbzcgECb2xKafXcI4lt

-kQj1iO4zBTs0Ft9EzXFc5ZBhpTjZrL6vrIa0y/CH2BiIHBJ0wRHx/40HXp4DSj3H

-ZpVOlEMI3npRfBGNIBllUaRNPWG7zL7DcKMIepBfPXyjBsxzH3yNiISq0W5hSiy+

-ImhSo3aipJUHHcp9Z9NgvpNC3QvnxsGKRnECmDRDlxkq+FQu9Iqs/HWFYWgyfcsw

-+YTrWZq3qVnnqUouHO//c9PGRy3sZSDU97MwvkjvWys1e01Xvd3AbHx08YAsxih5

-8i/OBKe81eD9NuZDP2KrjTxI5xkXKhj6DV2NnQIDAQABAoIBAGK0ZKnuYSiXux60

-5MvK4pOCsa/nY3mOcgVHhW4IzpRgJdIrcFOlz9ncXrBsSAIWjX7o3u2Ydvjs4DOW

-t8d6frB3QiDInYcRVDjLCD6otWV97Bk9Ua0G4N4hAWkMF7ysV4oihS1JDSoAdo39

-qOdki6s9yeyHZGKwk2oHLlowU5TxQMBA8DHmxqBII1HTm+8xRz45bcEqRXydYSUn

-P1JuSU9jFqdylxU+Nrq6ehslMQ3y7qNWQyiLGxu6EmR+vgrzSU0s3iAOqCHthaOS

-VBBXPL3DNEYUS+0QGnGrACuJhanOMBfdiO6Orelx6ZzWZm38PNGv0yBt0WCM+8/A

-TtQNGkECgYEA1LqR6AH9XikUQ0+rM4526BgVuYqtjw21h4Lj9alaA+YTQntBBJOv

-iAcUpnJiV4T8jzAMLeqpK8R/rbxRnK5S9jOV2gr+puk4L6tH46cgahBUESDigDp8

-6vK8ur6ubBcXNPh3AT6rsPj+Ph2EU3raqiYdouvCdga/OCYZb+jr6UkCgYEAy7Cr

-l8WssI/8/ORcQ4MFJFNyfz/Y2beNXyLd1PX0H+wRSiGcKzeUuTHNtzFFpMbrK/nx

-ZOPCT2ROdHsBHzp1L+WquCb0fyMVSiYiXBU+VCFDbUU5tBr3ycTc7VwuFPENOiha

-IdlWgew/aW110FQHIaqe9g+htRe+mXe++faZtbUCgYB/MSJmNzJX53XvHSZ/CBJ+

-iVAMBSfq3caJRLCqRNzGcf1YBbwFUYxlZ95n+wJj0+byckcF+UW3HqE8rtmZNf3y

-qTtTCLnj8JQgpGeybU4LPMIXD7N9+fqQvBwuCC7gABpnGJyHCQK9KNNTLnDdPRqb

-G3ki3ZYC3dvdZaJV8E2FyQKBgQCMa5Mf4kqWvezueo+QizZ0QILibqWUEhIH0AWV

-1qkhiKCytlDvCjYhJdBnxjP40Jk3i+t6XfmKud/MNTAk0ywOhQoYQeKz8v+uSnPN

-f2ekn/nXzq1lGGJSWsDjcXTjQvqXaVIZm7cjgjaE+80IfaUc9H75qvUT3vaq3f5u

-XC7DMQKBgQDMAzCCpWlEPbZoFMl6F49+7jG0/TiqM/WRUSQnNtufPMbrR9Je4QM1

-L1UCANCPaHFOncKYer15NfIV1ctt5MZKImevDsUaQO8CUlO+dzd5H8KvHw9E29gA

-B22v8k3jIjsYeRL+UJ/sBnWHgxdAe/NEM+TdlP2oP9D1gTifutPqAg==

deleted file mode 100755

@@ -1,18 +0,0 @@

-for selfsigned in delgkey1 delgkey2 delgkey3 delgkey4; do

-        subj='/C=US/ST=CA/L=SanFrancisco/O=Docker/CN=delegation'

-

-        openssl genrsa -out "${selfsigned}.key" 2048

-        openssl req -new -key "${selfsigned}.key" -out "${selfsigned}.csr" -sha256 -subj "${subj}"

-        cat > "${selfsigned}.cnf" <<EOL

-[selfsigned]

-basicConstraints = critical,CA:FALSE

-keyUsage = critical, digitalSignature, keyEncipherment

-extendedKeyUsage=codeSigning

-subjectKeyIdentifier=hash

-EOL

-

-        openssl x509 -req -days 3560 -in "${selfsigned}.csr" -signkey "${selfsigned}.key" -sha256 \

-                -out "${selfsigned}.crt" -extfile "${selfsigned}.cnf" -extensions selfsigned

-

-        rm "${selfsigned}.cnf" "${selfsigned}.csr"

-done

deleted file mode 100644

@@ -1,19 +0,0 @@

-MIIDCTCCAfOgAwIBAgIQTOoFF+ypXwgdXnXHuCTvYDALBgkqhkiG9w0BAQswJjER

-MA8GA1UEChMIUXVpY2tUTFMxETAPBgNVBAMTCFF1aWNrVExTMB4XDTE1MDcxNzE5

-NDg1M1oXDTE4MDcwMTE5NDg1M1owJzERMA8GA1UEChMIUXVpY2tUTFMxEjAQBgNV

-BAMTCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDO

-qvTBAi0ApXLfe90ApJkdkRGwF838Qzt1UFSxomu5fHRV6l3FjX5XCVHiFQ4w3ROh

-dMOu9NahfGLJv9VvWU2MV3YoY9Y7lIXpKwnK1v064wuls4nPh13BUWKQKofcY/e2

-qaSPd6/qmSRc/kJUvOI9jZMSX6ZRPu9K4PCqm2CivlbLq9UYuo1AbRGfuqHRvTxg

-mQG7WQCzGSvSjuSg5qX3TEh0HckTczJG9ODULNRWNE7ld0W4sfv4VF8R7Uc/G7LO

-8QwLCZ9TIl3gYMPCrhUL3Q6z9Jnn1SQS4mhDnPi6ugRYO1X8k3jjdxV9C2sXwUvN

-OZI1rLEWl9TJNA7ZXtMCAwEAAaM2MDQwDgYDVR0PAQH/BAQDAgCgMAwGA1UdEwEB

-/wQCMAAwFAYDVR0RBA0wC4IJbG9jYWxob3N0MAsGCSqGSIb3DQEBCwOCAQEAH6iq

-kM2+UMukGDLEQKHHiauioWJlHDlLXv76bJiNfjSz94B/2XOQMb9PT04//tnGUyPK

-K8Dx7RoxSodU6T5VRiz/A36mLOvt2t3bcL/1nHf9sAOHcexGtnCbQbW91V7RKfIL

-sjiLNFDkQ9VfVNY+ynQptZoyH1sy07+dplfkIiPzRs5WuVAnEGsX3r6BrhgUITzi

-g1B4kpmGZIohP4m6ZEBY5xuo/NQ0+GhjAENQMU38GpuoMyFS0i0dGcbx8weqnI/B

-Er/qa0+GE/rBnWY8TiRow8dzpneSFQnUZpJ4EwD9IoOIDHo7k2Nbz2P50HMiCXZf

-4RqzctVssRlrRVnO5w==

deleted file mode 100644

@@ -1,27 +0,0 @@

-MIIEogIBAAKCAQEAwM6q9MECLQClct973QCkmR2REbAXzfxDO3VQVLGia7l8dFXq

-XcWNflcJUeIVDjDdE6F0w6701qF8Ysm/1W9ZTYxXdihj1juUhekrCcrW/TrjC6Wz

-ic+HXcFRYpAqh9xj97appI93r+qZJFz+QlS84j2NkxJfplE+70rg8KqbYKK+Vsur

-1Ri6jUBtEZ+6odG9PGCZAbtZALMZK9KO5KDmpfdMSHQdyRNzMkb04NQs1FY0TuV3

-Rbix+/hUXxHtRz8bss7xDAsJn1MiXeBgw8KuFQvdDrP0mefVJBLiaEOc+Lq6BFg7

-VfyTeON3FX0LaxfBS805kjWssRaX1Mk0Dtle0wIDAQABAoIBAHbuhNHZROhRn70O

-Ui9vOBki/dt1ThnH5AkHQngb4t6kWjrAzILvW2p1cdBKr0ZDqftz+rzCbVD/5+Rg

-Iq8bsnB9g23lWEBMHD/GJsAxmRA3hNooamk11IBmwTcVSsbnkdq5mEdkICYphjHC

-Ey0DbEf6RBxWlx3WvAWLoNmTw6iFaOCH8IyLavPpe7kLbZc219oNUw2qjCnCXCZE

-/NuViADHJBPN8r7g1gmyclJmTumdUK6oHgXEMMPe43vhReGcgcReK9QZjnTcIXPM

-4oJOraw+BtoZXVvvIPnC+5ntoLFOzjIzM0kaveReZbdgffqF4zy2vRfCHhWssanc

-7a0xR4ECgYEA3Xuvcqy5Xw+v/jVCO0VZj++Z7apA78dY4tWsPx5/0DUTTziTlXkC

-ADduEbwX6HgZ/iLvA9j4C3Z4mO8qByby/6UoBU8NEe+PQt6fT7S+dKSP4uy5ZxVM

-i5opkEyrJsMbve9Jrlj4bk5CICsydrZ+SBFHnpNGjbduGQick5LORWECgYEA3trt

-gepteDGiUYmnnBgjbYtcD11RvpKC8Z/QwGnzN5vk4eBu8r7DkMcLN+SiHjAovlJo

-r5j3EbF8sla1zBf/yySdQZFqUGcwtw7MaAKCLdhQl5WsViNMIx6p2OJapu0dzbv2

-KTXrnoRCafcH92k0dUX1ahE9eyc8KX6VhbWwXLMCgYATGCCuEDoC+gVAMzM8jOQF

-xrBMjwr+IP+GvskUv/pg5tJ9V/FRR5dmkWDJ4p9lCUWkZTqZ6FCqHFKVTLkg2LjG

-VWS34HLOAwskxrCRXJG22KEW/TWWr31j46yFpjZzJwrzOvftMfpo+BI3V8IH/f+x

-EtxLzYKdoRy6x8VH67YgwQKBgHor2vjV45142FuK83AHa6SqOZXSuvWWrGJ6Ep7p

-doSN2jRaLXi2S9AaznOdy6JxFGUCGJHrcccpXgsGrjNtFLXxJKTFa1sYtwQkALsk

-ZOltJQF09D1krGC0driHntrUMvqOiKye+sS0DRS6cIuaCUAhUiELwoC5SaoV0zKy

-IDUxAoGAOK8Xq+3/sqe79vTpw25RXl+nkAmOAeKjqf3Kh6jbnBhr81rmefyKXB9a

-uj0b980tzUnliwA5cCOsyxfN2vASvMnJxFE721QZI04arlcPFHcFqCtmNnUYTcLp

-0hgn/yLZptcoxpy+eTBu3eNsxz1Bu/Tx/198+2Wr3MbtGpLNIcA=

deleted file mode 100644

@@ -1,34 +0,0 @@

-package main

-

-import (

-	"fmt"

-	"net"

-	"net/http"

-	"os"

-	"path/filepath"

-)

-

-func main() {

-	p, err := filepath.Abs(filepath.Join("run", "docker", "plugins"))

-	if err != nil {

-		panic(err)

-	}

-	if err := os.MkdirAll(p, 0755); err != nil {

-		panic(err)

-	}

-	l, err := net.Listen("unix", filepath.Join(p, "basic.sock"))

-	if err != nil {

-		panic(err)

-	}

-

-	mux := http.NewServeMux()

-	server := http.Server{

-		Addr:    l.Addr().String(),

-		Handler: http.NewServeMux(),

-	}

-	mux.HandleFunc("/Plugin.Activate", func(w http.ResponseWriter, r *http.Request) {

-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1.1+json")

-		fmt.Println(w, `{"Implements": ["dummy"]}`)

-	})

-	server.Serve(l)

-}

deleted file mode 100644

@@ -1,215 +0,0 @@

-package plugin // import "github.com/docker/docker/integration-cli/fixtures/plugin"

-

-import (

-	"encoding/json"

-	"io"

-	"io/ioutil"

-	"os"

-	"os/exec"

-	"path/filepath"

-	"time"

-

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

-	"github.com/docker/docker/pkg/archive"

-	"github.com/docker/docker/plugin"

-	"github.com/docker/docker/registry"

-	"github.com/pkg/errors"

-	"golang.org/x/net/context"

-)

-

-// CreateOpt is is passed used to change the default plugin config before

-// creating it

-type CreateOpt func(*Config)

-

-// Config wraps types.PluginConfig to provide some extra state for options

-// extra customizations on the plugin details, such as using a custom binary to

-// create the plugin with.

-type Config struct {

-	*types.PluginConfig

-	binPath string

-}

-

-// WithBinary is a CreateOpt to set an custom binary to create the plugin with.

-// This binary must be statically compiled.

-func WithBinary(bin string) CreateOpt {

-	return func(cfg *Config) {

-		cfg.binPath = bin

-	}

-}

-

-// CreateClient is the interface used for `BuildPlugin` to interact with the

-// daemon.

-type CreateClient interface {

-	PluginCreate(context.Context, io.Reader, types.PluginCreateOptions) error

-}

-

-// Create creates a new plugin with the specified name

-func Create(ctx context.Context, c CreateClient, name string, opts ...CreateOpt) error {

-	tmpDir, err := ioutil.TempDir("", "create-test-plugin")

-	if err != nil {

-		return err

-	}

-	defer os.RemoveAll(tmpDir)

-

-	tar, err := makePluginBundle(tmpDir, opts...)

-	if err != nil {

-		return err

-	}

-	defer tar.Close()

-

-	ctx, cancel := context.WithTimeout(ctx, 30*time.Second)

-	defer cancel()

-

-	return c.PluginCreate(ctx, tar, types.PluginCreateOptions{RepoName: name})

-}

-

-// CreateInRegistry makes a plugin (locally) and pushes it to a registry.

-// This does not use a dockerd instance to create or push the plugin.

-// If you just want to create a plugin in some daemon, use `Create`.

-//

-// This can be useful when testing plugins on swarm where you don't really want

-// the plugin to exist on any of the daemons (immediately) and there needs to be

-// some way to distribute the plugin.

-func CreateInRegistry(ctx context.Context, repo string, auth *types.AuthConfig, opts ...CreateOpt) error {

-	tmpDir, err := ioutil.TempDir("", "create-test-plugin-local")

-	if err != nil {

-		return err

-	}

-	defer os.RemoveAll(tmpDir)

-

-	inPath := filepath.Join(tmpDir, "plugin")

-	if err := os.MkdirAll(inPath, 0755); err != nil {

-		return errors.Wrap(err, "error creating plugin root")

-	}

-

-	tar, err := makePluginBundle(inPath, opts...)

-	if err != nil {

-		return err

-	}

-	defer tar.Close()

-

-	dummyExec := func(m *plugin.Manager) (plugin.Executor, error) {

-		return nil, nil

-	}

-

-	regService, err := registry.NewService(registry.ServiceOptions{V2Only: true})

-	if err != nil {

-		return err

-	}

-

-	managerConfig := plugin.ManagerConfig{

-		Store:           plugin.NewStore(),

-		RegistryService: regService,

-		Root:            filepath.Join(tmpDir, "root"),

-		ExecRoot:        "/run/docker", // manager init fails if not set

-		CreateExecutor:  dummyExec,

-		LogPluginEvent:  func(id, name, action string) {}, // panics when not set

-	}

-	manager, err := plugin.NewManager(managerConfig)

-	if err != nil {

-		return errors.Wrap(err, "error creating plugin manager")

-	}

-

-	ctx, cancel := context.WithTimeout(ctx, 30*time.Second)

-	defer cancel()

-	if err := manager.CreateFromContext(ctx, tar, &types.PluginCreateOptions{RepoName: repo}); err != nil {

-		return err

-	}

-

-	if auth == nil {

-		auth = &types.AuthConfig{}

-	}

-	err = manager.Push(ctx, repo, nil, auth, ioutil.Discard)

-	return errors.Wrap(err, "error pushing plugin")

-}

-

-func makePluginBundle(inPath string, opts ...CreateOpt) (io.ReadCloser, error) {

-	p := &types.PluginConfig{

-		Interface: types.PluginConfigInterface{

-			Socket: "basic.sock",

-			Types:  []types.PluginInterfaceType{{Capability: "docker.dummy/1.0"}},

-		},

-		Entrypoint: []string{"/basic"},

-	}

-	cfg := &Config{

-		PluginConfig: p,

-	}

-	for _, o := range opts {

-		o(cfg)

-	}

-	if cfg.binPath == "" {

-		binPath, err := ensureBasicPluginBin()

-		if err != nil {

-			return nil, err

-		}

-		cfg.binPath = binPath

-	}

-

-	configJSON, err := json.Marshal(p)

-	if err != nil {

-		return nil, err

-	}

-	if err := ioutil.WriteFile(filepath.Join(inPath, "config.json"), configJSON, 0644); err != nil {

-		return nil, err

-	}

-	if err := os.MkdirAll(filepath.Join(inPath, "rootfs", filepath.Dir(p.Entrypoint[0])), 0755); err != nil {

-		return nil, errors.Wrap(err, "error creating plugin rootfs dir")

-	}

-

-	// Ensure the mount target paths exist

-	for _, m := range p.Mounts {

-		var stat os.FileInfo

-		if m.Source != nil {

-			stat, err = os.Stat(*m.Source)

-			if err != nil && !os.IsNotExist(err) {

-				return nil, err

-			}

-		}

-

-		if stat == nil || stat.IsDir() {

-			var mode os.FileMode = 0755

-			if stat != nil {

-				mode = stat.Mode()

-			}

-			if err := os.MkdirAll(filepath.Join(inPath, "rootfs", m.Destination), mode); err != nil {

-				return nil, errors.Wrap(err, "error preparing plugin mount destination path")

-			}

-		} else {

-			if err := os.MkdirAll(filepath.Join(inPath, "rootfs", filepath.Dir(m.Destination)), 0755); err != nil {

-				return nil, errors.Wrap(err, "error preparing plugin mount destination dir")

-			}

-			f, err := os.Create(filepath.Join(inPath, "rootfs", m.Destination))

-			if err != nil && !os.IsExist(err) {

-				return nil, errors.Wrap(err, "error preparing plugin mount destination file")

-			}

-			if f != nil {

-				f.Close()

-			}

-		}

-	}

-	if err := archive.NewDefaultArchiver().CopyFileWithTar(cfg.binPath, filepath.Join(inPath, "rootfs", p.Entrypoint[0])); err != nil {

-		return nil, errors.Wrap(err, "error copying plugin binary to rootfs path")

-	}

-	tar, err := archive.Tar(inPath, archive.Uncompressed)

-	return tar, errors.Wrap(err, "error making plugin archive")

-}

-

-func ensureBasicPluginBin() (string, error) {

-	name := "docker-basic-plugin"

-	p, err := exec.LookPath(name)

-	if err == nil {

-		return p, nil

-	}

-

-	goBin, err := exec.LookPath("go")

-	if err != nil {

-		return "", err

-	}

-	installPath := filepath.Join(os.Getenv("GOPATH"), "bin", name)

-	cmd := exec.Command(goBin, "build", "-o", installPath, "./"+filepath.Join("fixtures", "plugin", "basic"))

-	cmd.Env = append(cmd.Env, "CGO_ENABLED=0")

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

-		return "", errors.Wrapf(err, "error building basic plugin bin: %s", string(out))

-	}

-	return installPath, nil

-}

deleted file mode 100644

@@ -1 +0,0 @@

-this is the secret

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

 	"sync"

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

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

+	"github.com/docker/docker/internal/test/fixtures/load"

 	"github.com/go-check/check"

 )

new file mode 100644

Binary files /dev/null and b/integration-cli/testdata/emptyLayer.tar differ

@@ -9,7 +9,7 @@ import (

 	"time"

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

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

+	"github.com/docker/docker/internal/test/fixtures/plugin"

 	"github.com/docker/docker/pkg/locker"

 	"github.com/pkg/errors"

 )

@@ -9,7 +9,7 @@ import (

 	"time"

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

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

+	"github.com/docker/docker/internal/test/fixtures/plugin"

 	"github.com/docker/docker/pkg/locker"

 	"github.com/pkg/errors"

 )

@@ -7,8 +7,8 @@ import (

 	"testing"

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

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

 	"github.com/docker/docker/internal/test/daemon"

+	"github.com/docker/docker/internal/test/fixtures/plugin"

 	"github.com/gotestyourself/gotestyourself/assert"

 )