@@ -49,11 +49,6 @@ RUN apt-get update && apt-get install -y \

 	&& make PREFIX=/build/ install-criu

 FROM base AS registry

-# Install two versions of the registry. The first is an older version that

-# only supports schema1 manifests. The second is a newer version that supports

-# both. This allows integration-cli tests to cover push/pull with both schema1

-# and schema2 manifests.

-ENV REGISTRY_COMMIT_SCHEMA1 ec87e9b6971d831f0eff752ddb54fb64693e51cd

 ENV REGISTRY_COMMIT 47a064d4195a9b56133891bbb13620c3ac83a827

 RUN set -x \

 	&& export GOPATH="$(mktemp -d)" \

@@ -61,13 +56,6 @@ RUN set -x \

 	&& (cd "$GOPATH/src/github.com/docker/distribution" && git checkout -q "$REGISTRY_COMMIT") \

 	&& GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH" \

 		go build -buildmode=pie -o /build/registry-v2 github.com/docker/distribution/cmd/registry \

-	&& case $(dpkg --print-architecture) in \

-		amd64|ppc64*|s390x) \

-		(cd "$GOPATH/src/github.com/docker/distribution" && git checkout -q "$REGISTRY_COMMIT_SCHEMA1"); \

-		GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH"; \

-			go build -buildmode=pie -o /build/registry-v2-schema1 github.com/docker/distribution/cmd/registry; \

-		;; \

-	   esac \

 	&& rm -rf "$GOPATH"

@@ -142,39 +142,6 @@ func (s *DockerRegistrySuite) TearDownTest(c *check.C) {

 }

 func init() {

-	check.Suite(&DockerSchema1RegistrySuite{

-		ds: &DockerSuite{},

-	})

-}

-

-type DockerSchema1RegistrySuite struct {

-	ds  *DockerSuite

-	reg *registry.V2

-	d   *daemon.Daemon

-}

-

-func (s *DockerSchema1RegistrySuite) OnTimeout(c *check.C) {

-	s.d.DumpStackAndQuit()

-}

-

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

-	testRequires(c, DaemonIsLinux, RegistryHosting, NotArm64, testEnv.IsLocalDaemon)

-	s.reg = registry.NewV2(c, registry.Schema1)

-	s.reg.WaitReady(c)

-	s.d = daemon.New(c, dockerBinary, dockerdBinary, testdaemon.WithEnvironment(testEnv.Execution))

-}

-

-func (s *DockerSchema1RegistrySuite) TearDownTest(c *check.C) {

-	if s.reg != nil {

-		s.reg.Close()

-	}

-	if s.d != nil {

-		s.d.Stop(c)

-	}

-	s.ds.TearDownTest(c)

-}

-

-func init() {

 	check.Suite(&DockerRegistryAuthHtpasswdSuite{

 		ds: &DockerSuite{},

 	})

@@ -3,12 +3,9 @@ package main

 import (

 	"encoding/json"

 	"fmt"

-	"os"

-	"path/filepath"

 	"regexp"

 	"strings"

-	"github.com/docker/distribution/manifest/schema1"

 	"github.com/docker/distribution/manifest/schema2"

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

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

@@ -80,10 +77,6 @@ func (s *DockerRegistrySuite) TestPullByTagDisplaysDigest(c *check.C) {

 	testPullByTagDisplaysDigest(c)

 }

-func (s *DockerSchema1RegistrySuite) TestPullByTagDisplaysDigest(c *check.C) {

-	testPullByTagDisplaysDigest(c)

-}

-

 func testPullByDigest(c *check.C) {

 	testRequires(c, DaemonIsLinux)

 	pushDigest, err := setupImage(c)

@@ -106,10 +99,6 @@ func (s *DockerRegistrySuite) TestPullByDigest(c *check.C) {

 	testPullByDigest(c)

 }

-func (s *DockerSchema1RegistrySuite) TestPullByDigest(c *check.C) {

-	testPullByDigest(c)

-}

-

 func testPullByDigestNoFallback(c *check.C) {

 	testRequires(c, DaemonIsLinux)

 	// pull from the registry using the <name>@<digest> reference

@@ -123,10 +112,6 @@ func (s *DockerRegistrySuite) TestPullByDigestNoFallback(c *check.C) {

 	testPullByDigestNoFallback(c)

 }

-func (s *DockerSchema1RegistrySuite) TestPullByDigestNoFallback(c *check.C) {

-	testPullByDigestNoFallback(c)

-}

-

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

 	pushDigest, err := setupImage(c)

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

@@ -563,131 +548,3 @@ func (s *DockerRegistrySuite) TestPullFailsWithAlteredManifest(c *check.C) {

 	expectedErrorMsg := fmt.Sprintf("manifest verification failed for digest %s", manifestDigest)

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

 }

-

-// TestPullFailsWithAlteredManifest tests that a `docker pull` fails when

-// we have modified a manifest blob and its digest cannot be verified.

-// This is the schema1 version of the test.

-func (s *DockerSchema1RegistrySuite) TestPullFailsWithAlteredManifest(c *check.C) {

-	testRequires(c, DaemonIsLinux)

-	manifestDigest, err := setupImage(c)

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

-

-	// Load the target manifest blob.

-	manifestBlob := s.reg.ReadBlobContents(c, manifestDigest)

-

-	var imgManifest schema1.Manifest

-	err = json.Unmarshal(manifestBlob, &imgManifest)

-	c.Assert(err, checker.IsNil, check.Commentf("unable to decode image manifest from blob"))

-

-	// Change a layer in the manifest.

-	imgManifest.FSLayers[0] = schema1.FSLayer{

-		BlobSum: digest.Digest("sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"),

-	}

-

-	// Move the existing data file aside, so that we can replace it with a

-	// malicious blob of data. NOTE: we defer the returned undo func.

-	undo := s.reg.TempMoveBlobData(c, manifestDigest)

-	defer undo()

-

-	alteredManifestBlob, err := json.MarshalIndent(imgManifest, "", "   ")

-	c.Assert(err, checker.IsNil, check.Commentf("unable to encode altered image manifest to JSON"))

-

-	s.reg.WriteBlobContents(c, manifestDigest, alteredManifestBlob)

-

-	// Now try pulling that image by digest. We should get an error about

-	// digest verification for the manifest digest.

-

-	// Pull from the registry using the <name>@<digest> reference.

-	imageReference := fmt.Sprintf("%s@%s", repoName, manifestDigest)

-	out, exitStatus, _ := dockerCmdWithError("pull", imageReference)

-	c.Assert(exitStatus, checker.Not(check.Equals), 0)

-

-	expectedErrorMsg := fmt.Sprintf("image verification failed for digest %s", manifestDigest)

-	c.Assert(out, checker.Contains, expectedErrorMsg)

-}

-

-// TestPullFailsWithAlteredLayer tests that a `docker pull` fails when

-// we have modified a layer blob and its digest cannot be verified.

-// This is the schema2 version of the test.

-func (s *DockerRegistrySuite) TestPullFailsWithAlteredLayer(c *check.C) {

-	testRequires(c, DaemonIsLinux)

-	manifestDigest, err := setupImage(c)

-	c.Assert(err, checker.IsNil)

-

-	// Load the target manifest blob.

-	manifestBlob := s.reg.ReadBlobContents(c, manifestDigest)

-

-	var imgManifest schema2.Manifest

-	err = json.Unmarshal(manifestBlob, &imgManifest)

-	c.Assert(err, checker.IsNil)

-

-	// Next, get the digest of one of the layers from the manifest.

-	targetLayerDigest := imgManifest.Layers[0].Digest

-

-	// Move the existing data file aside, so that we can replace it with a

-	// malicious blob of data. NOTE: we defer the returned undo func.

-	undo := s.reg.TempMoveBlobData(c, targetLayerDigest)

-	defer undo()

-

-	// Now make a fake data blob in this directory.

-	s.reg.WriteBlobContents(c, targetLayerDigest, []byte("This is not the data you are looking for."))

-

-	// Now try pulling that image by digest. We should get an error about

-	// digest verification for the target layer digest.

-

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

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

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

-	}

-

-	// Pull from the registry using the <name>@<digest> reference.

-	imageReference := fmt.Sprintf("%s@%s", repoName, manifestDigest)

-	out, exitStatus, _ := dockerCmdWithError("pull", imageReference)

-	c.Assert(exitStatus, checker.Not(check.Equals), 0, check.Commentf("expected a non-zero exit status"))

-

-	expectedErrorMsg := fmt.Sprintf("filesystem layer verification failed for digest %s", targetLayerDigest)

-	c.Assert(out, checker.Contains, expectedErrorMsg, check.Commentf("expected error message in output: %s", out))

-}

-

-// TestPullFailsWithAlteredLayer tests that a `docker pull` fails when

-// we have modified a layer blob and its digest cannot be verified.

-// This is the schema1 version of the test.

-func (s *DockerSchema1RegistrySuite) TestPullFailsWithAlteredLayer(c *check.C) {

-	testRequires(c, DaemonIsLinux)

-	manifestDigest, err := setupImage(c)

-	c.Assert(err, checker.IsNil)

-

-	// Load the target manifest blob.

-	manifestBlob := s.reg.ReadBlobContents(c, manifestDigest)

-

-	var imgManifest schema1.Manifest

-	err = json.Unmarshal(manifestBlob, &imgManifest)

-	c.Assert(err, checker.IsNil)

-

-	// Next, get the digest of one of the layers from the manifest.

-	targetLayerDigest := imgManifest.FSLayers[0].BlobSum

-

-	// Move the existing data file aside, so that we can replace it with a

-	// malicious blob of data. NOTE: we defer the returned undo func.

-	undo := s.reg.TempMoveBlobData(c, targetLayerDigest)

-	defer undo()

-

-	// Now make a fake data blob in this directory.

-	s.reg.WriteBlobContents(c, targetLayerDigest, []byte("This is not the data you are looking for."))

-

-	// Now try pulling that image by digest. We should get an error about

-	// digest verification for the target layer digest.

-

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

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

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

-	}

-

-	// Pull from the registry using the <name>@<digest> reference.

-	imageReference := fmt.Sprintf("%s@%s", repoName, manifestDigest)

-	out, exitStatus, _ := dockerCmdWithError("pull", imageReference)

-	c.Assert(exitStatus, checker.Not(check.Equals), 0, check.Commentf("expected a non-zero exit status"))

-

-	expectedErrorMsg := fmt.Sprintf("filesystem layer verification failed for digest %s", targetLayerDigest)

-	c.Assert(out, checker.Contains, expectedErrorMsg, check.Commentf("expected error message in output: %s", out))

-}

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

 	"path"

 	"path/filepath"

 	"regexp"

-	"runtime"

 	"strconv"

 	"strings"

 	"sync"

@@ -551,26 +550,6 @@ func (s *DockerDaemonSuite) TestDaemonAllocatesListeningPort(c *check.C) {

 	}

 }

-func (s *DockerDaemonSuite) TestDaemonUUIDGeneration(c *check.C) {

-	dir := "/var/lib/docker"

-	if runtime.GOOS == "windows" {

-		dir = filepath.Join(os.Getenv("programdata"), "docker")

-	}

-	file := filepath.Join(dir, "engine_uuid")

-	os.Remove(file)

-	s.d.Start(c)

-	s.d.Stop(c)

-

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

-	if err != nil {

-		c.Fatalf("Error opening uuid file")

-	}

-	// Test for uuid length

-	if fi.Size() != 36 {

-		c.Fatalf("Bad UUID size %d", fi.Size())

-	}

-}

-

 // GH#11320 - verify that the daemon exits on failure properly

 // Note that this explicitly tests the conflict of {-b,--bridge} and {--bip} options as the means

 // to get a daemon init failure; no other tests for -b/--bip conflict are therefore required

@@ -1198,59 +1177,6 @@ func (s *DockerDaemonSuite) TestDaemonUnixSockCleanedUp(c *check.C) {

 	}

 }

-func (s *DockerDaemonSuite) TestDaemonWithWrongkey(c *check.C) {

-	type Config struct {

-		Crv string `json:"crv"`

-		D   string `json:"d"`

-		Kid string `json:"kid"`

-		Kty string `json:"kty"`

-		X   string `json:"x"`

-		Y   string `json:"y"`

-	}

-

-	os.Remove("/etc/docker/key.json")

-	s.d.Start(c)

-	s.d.Stop(c)

-

-	config := &Config{}

-	bytes, err := ioutil.ReadFile("/etc/docker/key.json")

-	if err != nil {

-		c.Fatalf("Error reading key.json file: %s", err)

-	}

-

-	// byte[] to Data-Struct

-	if err := json.Unmarshal(bytes, &config); err != nil {

-		c.Fatalf("Error Unmarshal: %s", err)

-	}

-

-	//replace config.Kid with the fake value

-	config.Kid = "VSAJ:FUYR:X3H2:B2VZ:KZ6U:CJD5:K7BX:ZXHY:UZXT:P4FT:MJWG:HRJ4"

-

-	// NEW Data-Struct to byte[]

-	newBytes, err := json.Marshal(&config)

-	if err != nil {

-		c.Fatalf("Error Marshal: %s", err)

-	}

-

-	// write back

-	if err := ioutil.WriteFile("/etc/docker/key.json", newBytes, 0400); err != nil {

-		c.Fatalf("Error ioutil.WriteFile: %s", err)

-	}

-

-	defer os.Remove("/etc/docker/key.json")

-

-	if err := s.d.StartWithError(); err == nil {

-		c.Fatalf("It should not be successful to start daemon with wrong key: %v", err)

-	}

-

-	content, err := s.d.ReadLogFile()

-	c.Assert(err, checker.IsNil)

-

-	if !strings.Contains(string(content), "Public Key ID does not match") {

-		c.Fatalf("Missing KeyID message from daemon logs: %s", string(content))

-	}

-}

-

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

 	s.d.StartWithBusybox(c)

@@ -55,10 +55,6 @@ func (s *DockerRegistrySuite) TestPullImageWithAliases(c *check.C) {

 	testPullImageWithAliases(c)

 }

-func (s *DockerSchema1RegistrySuite) TestPullImageWithAliases(c *check.C) {

-	testPullImageWithAliases(c)

-}

-

 // testConcurrentPullWholeRepo pulls the same repo concurrently.

 func testConcurrentPullWholeRepo(c *check.C) {

 	repoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL)

@@ -111,10 +107,6 @@ func (s *DockerRegistrySuite) testConcurrentPullWholeRepo(c *check.C) {

 	testConcurrentPullWholeRepo(c)

 }

-func (s *DockerSchema1RegistrySuite) testConcurrentPullWholeRepo(c *check.C) {

-	testConcurrentPullWholeRepo(c)

-}

-

 // testConcurrentFailingPull tries a concurrent pull that doesn't succeed.

 func testConcurrentFailingPull(c *check.C) {

 	repoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL)

@@ -142,10 +134,6 @@ func (s *DockerRegistrySuite) testConcurrentFailingPull(c *check.C) {

 	testConcurrentFailingPull(c)

 }

-func (s *DockerSchema1RegistrySuite) testConcurrentFailingPull(c *check.C) {

-	testConcurrentFailingPull(c)

-}

-

 // testConcurrentPullMultipleTags pulls multiple tags from the same repo

 // concurrently.

 func testConcurrentPullMultipleTags(c *check.C) {

@@ -198,10 +186,6 @@ func (s *DockerRegistrySuite) TestConcurrentPullMultipleTags(c *check.C) {

 	testConcurrentPullMultipleTags(c)

 }

-func (s *DockerSchema1RegistrySuite) TestConcurrentPullMultipleTags(c *check.C) {

-	testConcurrentPullMultipleTags(c)

-}

-

 // testPullIDStability verifies that pushing an image and pulling it back

 // preserves the image ID.

 func testPullIDStability(c *check.C) {

@@ -259,10 +243,6 @@ func (s *DockerRegistrySuite) TestPullIDStability(c *check.C) {

 	testPullIDStability(c)

 }

-func (s *DockerSchema1RegistrySuite) TestPullIDStability(c *check.C) {

-	testPullIDStability(c)

-}

-

 // #21213

 func testPullNoLayers(c *check.C) {

 	repoName := fmt.Sprintf("%v/dockercli/scratch", privateRegistryURL)

@@ -279,10 +259,6 @@ func (s *DockerRegistrySuite) TestPullNoLayers(c *check.C) {

 	testPullNoLayers(c)

 }

-func (s *DockerSchema1RegistrySuite) TestPullNoLayers(c *check.C) {

-	testPullNoLayers(c)

-}

-

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

 	testRequires(c, NotArm)

 	pushDigest, err := setupImage(c)

@@ -30,10 +30,6 @@ func (s *DockerRegistrySuite) TestPushBusyboxImage(c *check.C) {

 	testPushBusyboxImage(c)

 }

-func (s *DockerSchema1RegistrySuite) TestPushBusyboxImage(c *check.C) {

-	testPushBusyboxImage(c)

-}

-

 // pushing an image without a prefix should throw an error

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

 	out, _, err := dockerCmdWithError("push", "busybox")

@@ -53,10 +49,6 @@ func (s *DockerRegistrySuite) TestPushUntagged(c *check.C) {

 	testPushUntagged(c)

 }

-func (s *DockerSchema1RegistrySuite) TestPushUntagged(c *check.C) {

-	testPushUntagged(c)

-}

-

 func testPushBadTag(c *check.C) {

 	repoName := fmt.Sprintf("%v/dockercli/busybox:latest", privateRegistryURL)

 	expected := "does not exist"

@@ -70,10 +62,6 @@ func (s *DockerRegistrySuite) TestPushBadTag(c *check.C) {

 	testPushBadTag(c)

 }

-func (s *DockerSchema1RegistrySuite) TestPushBadTag(c *check.C) {

-	testPushBadTag(c)

-}

-

 func testPushMultipleTags(c *check.C) {

 	repoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL)

 	repoTag1 := fmt.Sprintf("%v/dockercli/busybox:t1", privateRegistryURL)

@@ -115,10 +103,6 @@ func (s *DockerRegistrySuite) TestPushMultipleTags(c *check.C) {

 	testPushMultipleTags(c)

 }

-func (s *DockerSchema1RegistrySuite) TestPushMultipleTags(c *check.C) {

-	testPushMultipleTags(c)

-}

-

 func testPushEmptyLayer(c *check.C) {

 	repoName := fmt.Sprintf("%v/dockercli/emptylayer", privateRegistryURL)

 	emptyTarball, err := ioutil.TempFile("", "empty_tarball")

@@ -146,10 +130,6 @@ func (s *DockerRegistrySuite) TestPushEmptyLayer(c *check.C) {

 	testPushEmptyLayer(c)

 }

-func (s *DockerSchema1RegistrySuite) TestPushEmptyLayer(c *check.C) {

-	testPushEmptyLayer(c)

-}

-

 // testConcurrentPush pushes multiple tags to the same repo

 // concurrently.

 func testConcurrentPush(c *check.C) {

@@ -200,10 +180,6 @@ func (s *DockerRegistrySuite) TestConcurrentPush(c *check.C) {

 	testConcurrentPush(c)

 }

-func (s *DockerSchema1RegistrySuite) TestConcurrentPush(c *check.C) {

-	testConcurrentPush(c)

-}

-

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

 	sourceRepoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL)

 	// tag the image to upload it to the private registry

@@ -245,39 +221,6 @@ func (s *DockerRegistrySuite) TestCrossRepositoryLayerPush(c *check.C) {

 	c.Assert(out4, check.Equals, "hello world")

 }

-func (s *DockerSchema1RegistrySuite) TestCrossRepositoryLayerPushNotSupported(c *check.C) {

-	sourceRepoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL)

-	// tag the image to upload it to the private registry

-	dockerCmd(c, "tag", "busybox", sourceRepoName)

-	// push the image to the registry

-	out1, _, err := dockerCmdWithError("push", sourceRepoName)

-	c.Assert(err, check.IsNil, check.Commentf("pushing the image to the private registry has failed: %s", out1))

-	// ensure that none of the layers were mounted from another repository during push

-	c.Assert(strings.Contains(out1, "Mounted from"), check.Equals, false)

-

-	digest1 := reference.DigestRegexp.FindString(out1)

-	c.Assert(len(digest1), checker.GreaterThan, 0, check.Commentf("no digest found for pushed manifest"))

-

-	destRepoName := fmt.Sprintf("%v/dockercli/crossrepopush", privateRegistryURL)

-	// retag the image to upload the same layers to another repo in the same registry

-	dockerCmd(c, "tag", "busybox", destRepoName)

-	// push the image to the registry

-	out2, _, err := dockerCmdWithError("push", destRepoName)

-	c.Assert(err, check.IsNil, check.Commentf("pushing the image to the private registry has failed: %s", out2))

-	// schema1 registry should not support cross-repo layer mounts, so ensure that this does not happen

-	c.Assert(strings.Contains(out2, "Mounted from"), check.Equals, false)

-

-	digest2 := reference.DigestRegexp.FindString(out2)

-	c.Assert(len(digest2), checker.GreaterThan, 0, check.Commentf("no digest found for pushed manifest"))

-	c.Assert(digest1, check.Not(check.Equals), digest2)

-

-	// ensure that we can pull and run the second pushed repository

-	dockerCmd(c, "rmi", destRepoName)

-	dockerCmd(c, "pull", destRepoName)

-	out3, _ := dockerCmd(c, "run", destRepoName, "echo", "-n", "hello world")

-	c.Assert(out3, check.Equals, "hello world")

-}

-

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

 	repoName := fmt.Sprintf("%s/busybox", privateRegistryURL)

 	dockerCmd(c, "tag", "busybox", repoName)

new file mode 100644

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

+package system

+

+import (

+	"context"

+	"testing"

+

+	"github.com/pborman/uuid"

+	"gotest.tools/assert"

+)

+

+func TestUUIDGeneration(t *testing.T) {

+	defer setupTest(t)()

+

+	c := testEnv.APIClient()

+	info, err := c.Info(context.Background())

+	assert.NilError(t, err)

+

+	id := uuid.Parse(info.ID)

+	assert.Equal(t, id != nil, true)

+}