@@ -78,41 +78,8 @@ RUN --mount=type=cache,sharing=locked,id=moby-criu-aptlib,target=/var/lib/apt \

         && /build/criu --version

 # registry

-FROM base AS registry-src

-WORKDIR /usr/src/registry

-RUN git init . && git remote add origin "https://github.com/distribution/distribution.git"

-

-FROM base AS registry

-WORKDIR /go/src/github.com/docker/distribution

-

-# REGISTRY_VERSION_SCHEMA1 specifies the version of the registry to build and

-# install from the https://github.com/docker/distribution repository. This is

-# an older (pre v2.3.0) version of the registry that only supports schema1

-# manifests. This version of the registry is not working on arm64, so installation

-# is skipped on that architecture.

-ARG REGISTRY_VERSION_SCHEMA1=v2.1.0

-ARG TARGETPLATFORM

-RUN --mount=from=registry-src,src=/usr/src/registry,rw \

-    --mount=type=cache,target=/root/.cache/go-build,id=registry-build-$TARGETPLATFORM \

-    --mount=type=cache,target=/go/pkg/mod \

-    --mount=type=tmpfs,target=/go/src <<EOT

-  set -ex

-  export GOPATH="/go/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH"

-  # Make the /build directory no matter what so that it doesn't fail on arm64 or

-  # any other platform where we don't build this registry

-  mkdir /build

-  case $TARGETPLATFORM in

-    linux/amd64|linux/arm/v7|linux/ppc64le|linux/s390x)

-      git fetch -q --depth 1 origin "${REGISTRY_VERSION_SCHEMA1}" +refs/tags/*:refs/tags/*

-      git checkout -q FETCH_HEAD

-      CGO_ENABLED=0 xx-go build -o /build/registry-v2-schema1 -v ./cmd/registry

-      xx-verify /build/registry-v2-schema1

-      ;;

-  esac

-EOT

-

-FROM distribution/distribution:$REGISTRY_VERSION AS registry-v2

-RUN mkdir /build && mv /bin/registry /build/registry-v2

+FROM distribution/distribution:$REGISTRY_VERSION AS registry

+RUN mkdir /build && mv /bin/registry /build/registry

 # go-swagger

 FROM base AS swagger-src

@@ -467,7 +434,6 @@ COPY --link --from=delve         /build/ /usr/local/bin/

 COPY --link --from=gowinres      /build/ /usr/local/bin/

 COPY --link --from=tini          /build/ /usr/local/bin/

 COPY --link --from=registry      /build/ /usr/local/bin/

-COPY --link --from=registry-v2   /build/ /usr/local/bin/

 # Skip the CRIU stage for now, as the opensuse package repository is sometimes

 # unstable, and we're currently not using it in CI.

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

 	"context"

 	"encoding/json"

 	"net/http"

-	"os"

 	"github.com/distribution/reference"

 	"github.com/docker/distribution"

@@ -154,15 +153,10 @@ func (dr *distributionRouter) fetchManifest(ctx context.Context, distrepo distri

 				distributionInspect.Platforms = append(distributionInspect.Platforms, platform)

 			}

 		}

+

+	// TODO(thaJeztah); we only use this to produce a nice error, but as a result, we can't remove libtrust as dependency - see if we can reduce the dependencies, but still able to detect it's a deprecated manifest

 	case *schema1.SignedManifest:

-		if os.Getenv("DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE") == "" {

-			return registry.DistributionInspect{}, distributionpkg.DeprecatedSchema1ImageError(namedRef)

-		}

-		platform := ocispec.Platform{

-			Architecture: mnfstObj.Architecture,

-			OS:           "linux",

-		}

-		distributionInspect.Platforms = append(distributionInspect.Platforms, platform)

+		return registry.DistributionInspect{}, distributionpkg.DeprecatedSchema1ImageError(namedRef)

 	}

 	return distributionInspect, nil

 }

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

 	"context"

 	"fmt"

 	"io"

-	"os"

 	"strings"

 	"time"

@@ -151,16 +150,10 @@ func (i *ImageService) pullTag(ctx context.Context, ref reference.Named, platfor

 		}

 	}()

-	var sentPullingFrom, sentSchema1Deprecation bool

+	var sentPullingFrom bool

 	ah := c8dimages.HandlerFunc(func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {

-		if desc.MediaType == c8dimages.MediaTypeDockerSchema1Manifest && !sentSchema1Deprecation {

-			err := distribution.DeprecatedSchema1ImageError(ref)

-			if os.Getenv("DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE") == "" {

-				log.G(context.TODO()).Warn(err.Error())

-				return nil, err

-			}

-			progress.Message(out, "", err.Error())

-			sentSchema1Deprecation = true

+		if desc.MediaType == c8dimages.MediaTypeDockerSchema1Manifest {

+			return nil, distribution.DeprecatedSchema1ImageError(ref)

 		}

 		if c8dimages.IsLayerType(desc.MediaType) {

 			id := stringid.TruncateID(desc.Digest.String())

@@ -235,7 +235,7 @@ type invalidArgumentErr struct{ error }

 func (invalidArgumentErr) InvalidParameter() {}

 func DeprecatedSchema1ImageError(ref reference.Named) error {

-	msg := "[DEPRECATION NOTICE] Docker Image Format v1 and Docker Image manifest version 2, schema 1 support is disabled by default and will be removed in an upcoming release."

+	msg := "Docker Image Format v1 and Docker Image manifest version 2, schema 1 support has been removed."

 	if ref != nil {

 		msg += " Suggest the author of " + ref.String() + " to upgrade the image to the OCI Format or Docker Image manifest v2, schema 2."

 	}

deleted file mode 100644

@@ -1,38 +0,0 @@

-{

-   "schemaVersion": 2,

-   "name": "library/hello-world",

-   "tag": "latest",

-   "architecture": "amd64",

-   "fsLayers": [

-      {

-         "blobSum": "sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4"

-      },

-      {

-         "blobSum": "sha256:03f4658f8b782e12230c1783426bd3bacce651ce582a4ffb6fbbfa2079428ecb"

-      }

-   ],

-   "history": [

-      {

-         "v1Compatibility": "{\"id\":\"af340544ed62de0680f441c71fa1a80cb084678fed42bae393e543faea3a572c\",\"parent\":\"535020c3e8add9d6bb06e5ac15a261e73d9b213d62fb2c14d752b8e189b2b912\",\"created\":\"2015-08-06T23:53:22.608577814Z\",\"container\":\"c2b715156f640c7ac7d98472ea24335aba5432a1323a3bb722697e6d37ef794f\",\"container_config\":{\"Hostname\":\"9aeb0006ffa7\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) CMD [\\\"/hello\\\"]\"],\"Image\":\"535020c3e8add9d6bb06e5ac15a261e73d9b213d62fb2c14d752b8e189b2b912\",\"Volumes\":null,\"VolumeDriver\":\"\",\"WorkingDir\":\"\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":null,\"Labels\":{}},\"docker_version\":\"1.7.1\",\"config\":{\"Hostname\":\"9aeb0006ffa7\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":[\"/hello\"],\"Image\":\"535020c3e8add9d6bb06e5ac15a261e73d9b213d62fb2c14d752b8e189b2b912\",\"Volumes\":null,\"VolumeDriver\":\"\",\"WorkingDir\":\"\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":null,\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":0}\n"

-      },

-      {

-         "v1Compatibility": "{\"id\":\"535020c3e8add9d6bb06e5ac15a261e73d9b213d62fb2c14d752b8e189b2b912\",\"created\":\"2015-08-06T23:53:22.241352727Z\",\"container\":\"9aeb0006ffa72a8287564caaea87625896853701459261d3b569e320c0c9d5dc\",\"container_config\":{\"Hostname\":\"9aeb0006ffa7\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) COPY file:4abd3bff60458ca3b079d7b131ce26b2719055a030dfa96ff827da2b7c7038a7 in /\"],\"Image\":\"\",\"Volumes\":null,\"VolumeDriver\":\"\",\"WorkingDir\":\"\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":null,\"Labels\":null},\"docker_version\":\"1.7.1\",\"config\":{\"Hostname\":\"9aeb0006ffa7\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":null,\"Image\":\"\",\"Volumes\":null,\"VolumeDriver\":\"\",\"WorkingDir\":\"\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":null,\"Labels\":null},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":960}\n"

-      }

-   ],

-   "signatures": [

-      {

-         "header": {

-            "jwk": {

-               "crv": "P-256",

-               "kid": "OIH7:HQFS:44FK:45VB:3B53:OIAG:TPL4:ATF5:6PNE:MGHN:NHQX:2GE4",

-               "kty": "EC",

-               "x": "Cu_UyxwLgHzE9rvlYSmvVdqYCXY42E9eNhBb0xNv0SQ",

-               "y": "zUsjWJkeKQ5tv7S-hl1Tg71cd-CqnrtiiLxSi6N_yc8"

-            },

-            "alg": "ES256"

-         },

-         "signature": "Y6xaFz9Sy-OtcnKQS1Ilq3Dh8cu4h3nBTJCpOTF1XF7vKtcxxA_xMP8-SgDo869SJ3VsvgPL9-Xn-OoYG2rb1A",

-         "protected": "eyJmb3JtYXRMZW5ndGgiOjMxOTcsImZvcm1hdFRhaWwiOiJDbjAiLCJ0aW1lIjoiMjAxNS0wOS0xMVQwNDoxMzo0OFoifQ"

-      }

-   ]

-}

deleted file mode 100644

@@ -1,46 +0,0 @@

-{

-   "schemaVersion": 1,

-   "name": "library/hello-world",

-   "tag": "latest",

-   "architecture": "amd64",

-   "fsLayers": [

-      {

-         "blobSum": "sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4"

-      },

-      {

-         "blobSum": "sha256:03f4658f8b782e12230c1783426bd3bacce651ce582a4ffb6fbbfa2079428ecb"

-      }

-   ],

-   "history": [

-      {

-         "v1Compatibility": "{\"id\":\"af340544ed62de0680f441c71fa1a80cb084678fed42bae393e543faea3a572c\",\"parent\":\"535020c3e8add9d6bb06e5ac15a261e73d9b213d62fb2c14d752b8e189b2b912\",\"created\":\"2015-08-06T23:53:22.608577814Z\",\"container\":\"c2b715156f640c7ac7d98472ea24335aba5432a1323a3bb722697e6d37ef794f\",\"container_config\":{\"Hostname\":\"9aeb0006ffa7\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) CMD [\\\"/hello\\\"]\"],\"Image\":\"535020c3e8add9d6bb06e5ac15a261e73d9b213d62fb2c14d752b8e189b2b912\",\"Volumes\":null,\"VolumeDriver\":\"\",\"WorkingDir\":\"\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":null,\"Labels\":{}},\"docker_version\":\"1.7.1\",\"config\":{\"Hostname\":\"9aeb0006ffa7\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":[\"/hello\"],\"Image\":\"535020c3e8add9d6bb06e5ac15a261e73d9b213d62fb2c14d752b8e189b2b912\",\"Volumes\":null,\"VolumeDriver\":\"\",\"WorkingDir\":\"\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":null,\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":0}\n"

-      },

-      {

-         "v1Compatibility": "{\"id\":\"535020c3e8add9d6bb06e5ac15a261e73d9b213d62fb2c14d752b8e189b2b912\",\"created\":\"2015-08-06T23:53:22.241352727Z\",\"container\":\"9aeb0006ffa72a8287564caaea87625896853701459261d3b569e320c0c9d5dc\",\"container_config\":{\"Hostname\":\"9aeb0006ffa7\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) COPY file:4abd3bff60458ca3b079d7b131ce26b2719055a030dfa96ff827da2b7c7038a7 in /\"],\"Image\":\"\",\"Volumes\":null,\"VolumeDriver\":\"\",\"WorkingDir\":\"\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":null,\"Labels\":null},\"docker_version\":\"1.7.1\",\"config\":{\"Hostname\":\"9aeb0006ffa7\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":null,\"Image\":\"\",\"Volumes\":null,\"VolumeDriver\":\"\",\"WorkingDir\":\"\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":null,\"Labels\":null},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":960}\n"

-      }

-   ],

-   "fsLayers": [

-      {

-         "blobSum": "sha256:ffff95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4"

-      },

-      {

-         "blobSum": "sha256:ffff658f8b782e12230c1783426bd3bacce651ce582a4ffb6fbbfa2079428ecb"

-      }

-   ],

-   "signatures": [

-      {

-         "header": {

-            "jwk": {

-               "crv": "P-256",

-               "kid": "OIH7:HQFS:44FK:45VB:3B53:OIAG:TPL4:ATF5:6PNE:MGHN:NHQX:2GE4",

-               "kty": "EC",

-               "x": "Cu_UyxwLgHzE9rvlYSmvVdqYCXY42E9eNhBb0xNv0SQ",

-               "y": "zUsjWJkeKQ5tv7S-hl1Tg71cd-CqnrtiiLxSi6N_yc8"

-            },

-            "alg": "ES256"

-         },

-         "signature": "Y6xaFz9Sy-OtcnKQS1Ilq3Dh8cu4h3nBTJCpOTF1XF7vKtcxxA_xMP8-SgDo869SJ3VsvgPL9-Xn-OoYG2rb1A",

-         "protected": "eyJmb3JtYXRMZW5ndGgiOjMxOTcsImZvcm1hdFRhaWwiOiJDbjAiLCJ0aW1lIjoiMjAxNS0wOS0xMVQwNDoxMzo0OFoifQ"

-      }

-   ]

-}

deleted file mode 100644

@@ -1,38 +0,0 @@

-{

-   "schemaVersion": 1,

-   "name": "library/hello-world",

-   "tag": "latest",

-   "architecture": "amd64",

-   "fsLayers": [

-      {

-         "blobSum": "sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4"

-      },

-      {

-         "blobSum": "sha256:03f4658f8b782e12230c1783426bd3bacce651ce582a4ffb6fbbfa2079428ecb"

-      }

-   ],

-   "history": [

-      {

-         "v1Compatibility": "{\"id\":\"af340544ed62de0680f441c71fa1a80cb084678fed42bae393e543faea3a572c\",\"parent\":\"535020c3e8add9d6bb06e5ac15a261e73d9b213d62fb2c14d752b8e189b2b912\",\"created\":\"2015-08-06T23:53:22.608577814Z\",\"container\":\"c2b715156f640c7ac7d98472ea24335aba5432a1323a3bb722697e6d37ef794f\",\"container_config\":{\"Hostname\":\"9aeb0006ffa7\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) CMD [\\\"/hello\\\"]\"],\"Image\":\"535020c3e8add9d6bb06e5ac15a261e73d9b213d62fb2c14d752b8e189b2b912\",\"Volumes\":null,\"VolumeDriver\":\"\",\"WorkingDir\":\"\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":null,\"Labels\":{}},\"docker_version\":\"1.7.1\",\"config\":{\"Hostname\":\"9aeb0006ffa7\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":[\"/hello\"],\"Image\":\"535020c3e8add9d6bb06e5ac15a261e73d9b213d62fb2c14d752b8e189b2b912\",\"Volumes\":null,\"VolumeDriver\":\"\",\"WorkingDir\":\"\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":null,\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":0}\n"

-      },

-      {

-         "v1Compatibility": "{\"id\":\"535020c3e8add9d6bb06e5ac15a261e73d9b213d62fb2c14d752b8e189b2b912\",\"created\":\"2015-08-06T23:53:22.241352727Z\",\"container\":\"9aeb0006ffa72a8287564caaea87625896853701459261d3b569e320c0c9d5dc\",\"container_config\":{\"Hostname\":\"9aeb0006ffa7\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) COPY file:4abd3bff60458ca3b079d7b131ce26b2719055a030dfa96ff827da2b7c7038a7 in /\"],\"Image\":\"\",\"Volumes\":null,\"VolumeDriver\":\"\",\"WorkingDir\":\"\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":null,\"Labels\":null},\"docker_version\":\"1.7.1\",\"config\":{\"Hostname\":\"9aeb0006ffa7\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":null,\"Image\":\"\",\"Volumes\":null,\"VolumeDriver\":\"\",\"WorkingDir\":\"\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":null,\"Labels\":null},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":960}\n"

-      }

-   ],

-   "signatures": [

-      {

-         "header": {

-            "jwk": {

-               "crv": "P-256",

-               "kid": "OIH7:HQFS:44FK:45VB:3B53:OIAG:TPL4:ATF5:6PNE:MGHN:NHQX:2GE4",

-               "kty": "EC",

-               "x": "Cu_UyxwLgHzE9rvlYSmvVdqYCXY42E9eNhBb0xNv0SQ",

-               "y": "zUsjWJkeKQ5tv7S-hl1Tg71cd-CqnrtiiLxSi6N_yc8"

-            },

-            "alg": "ES256"

-         },

-         "signature": "Y6xaFz9Sy-OtcnKQS1Ilq3Dh8cu4h3nBTJCpOTF1XF7vKtcxxA_xMP8-SgDo869SJ3VsvgPL9-Xn-OoYG2rb1A",

-         "protected": "eyJmb3JtYXRMZW5ndGgiOjMxOTcsImZvcm1hdFRhaWwiOiJDbjAiLCJ0aW1lIjoiMjAxNS0wOS0xMVQwNDoxMzo0OFoifQ"

-      }

-   ]

-}

\ No newline at end of file

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

 	"encoding/json"

 	"fmt"

 	"io"

-	"os"

 	"strings"

 	"github.com/containerd/containerd/v2/core/content"

@@ -292,15 +291,7 @@ func detectManifestBlobMediaType(dt []byte) (string, error) {

 		}

 		return mfst.MediaType, nil

 	case schema1.MediaTypeManifest:

-		if os.Getenv("DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE") == "" {

-			err := DeprecatedSchema1ImageError(nil)

-			log.G(context.TODO()).Warn(err.Error())

-			return "", err

-		}

-		if mfst.Manifests != nil || mfst.Layers != nil {

-			return "", fmt.Errorf(`media-type: %q should not have "manifests" or "layers"`, mfst.MediaType)

-		}

-		return mfst.MediaType, nil

+		return "", DeprecatedSchema1ImageError(nil)

 	default:

 		if mfst.MediaType != "" {

 			return mfst.MediaType, nil

@@ -308,12 +299,7 @@ func detectManifestBlobMediaType(dt []byte) (string, error) {

 	}

 	switch {

 	case mfst.FSLayers != nil && mfst.Manifests == nil && mfst.Layers == nil && mfst.Config == nil:

-		if os.Getenv("DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE") == "" {

-			err := DeprecatedSchema1ImageError(nil)

-			log.G(context.TODO()).Warn(err.Error())

-			return "", err

-		}

-		return schema1.MediaTypeManifest, nil

+		return "", DeprecatedSchema1ImageError(nil)

 	case mfst.Config != nil && mfst.Manifests == nil && mfst.FSLayers == nil,

 		mfst.Layers != nil && mfst.Manifests == nil && mfst.FSLayers == nil:

 		return ocispec.MediaTypeImageManifest, nil

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

 	"github.com/docker/distribution"

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

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

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

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

 	"github.com/google/go-cmp/cmp/cmpopts"

 	"github.com/opencontainers/go-digest"

@@ -338,14 +337,12 @@ func TestDetectManifestBlobMediaType(t *testing.T) {

 	cases := map[string]testCase{

 		"mediaType is set":   {[]byte(`{"mediaType": "bananas"}`), "bananas"},

 		"oci manifest":       {[]byte(`{"config": {}}`), ocispec.MediaTypeImageManifest},

-		"schema1":            {[]byte(`{"fsLayers": []}`), schema1.MediaTypeManifest},

 		"oci index fallback": {[]byte(`{}`), ocispec.MediaTypeImageIndex},

 		// Make sure we prefer mediaType

 		"mediaType and config set":   {[]byte(`{"mediaType": "bananas", "config": {}}`), "bananas"},

 		"mediaType and fsLayers set": {[]byte(`{"mediaType": "bananas", "fsLayers": []}`), "bananas"},

 	}

-	t.Setenv("DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE", "1")

 	for name, tc := range cases {

 		t.Run(name, func(t *testing.T) {

 			mt, err := detectManifestBlobMediaType(tc.json)

@@ -361,14 +358,6 @@ func TestDetectManifestBlobMediaTypeInvalid(t *testing.T) {

 		expected string

 	}

 	cases := map[string]testCase{

-		"schema 1 mediaType with manifests": {

-			[]byte(`{"mediaType": "` + schema1.MediaTypeManifest + `","manifests":[]}`),

-			`media-type: "application/vnd.docker.distribution.manifest.v1+json" should not have "manifests" or "layers"`,

-		},

-		"schema 1 mediaType with layers": {

-			[]byte(`{"mediaType": "` + schema1.MediaTypeManifest + `","layers":[]}`),

-			`media-type: "application/vnd.docker.distribution.manifest.v1+json" should not have "manifests" or "layers"`,

-		},

 		"schema 2 mediaType with manifests": {

 			[]byte(`{"mediaType": "` + schema2.MediaTypeManifest + `","manifests":[]}`),

 			`media-type: "application/vnd.docker.distribution.manifest.v2+json" should not have "manifests" or "fsLayers"`,

@@ -415,7 +404,6 @@ func TestDetectManifestBlobMediaTypeInvalid(t *testing.T) {

 		},

 	}

-	t.Setenv("DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE", "1")

 	for name, tc := range cases {

 		t.Run(name, func(t *testing.T) {

 			mt, err := detectManifestBlobMediaType(tc.json)

@@ -2,7 +2,6 @@ package distribution // import "github.com/docker/docker/distribution"

 import (

 	"context"

-	"encoding/json"

 	"fmt"

 	"io"

 	"os"

@@ -22,7 +21,6 @@ import (

 	"github.com/docker/docker/distribution/metadata"

 	"github.com/docker/docker/distribution/xfer"

 	"github.com/docker/docker/image"

-	v1 "github.com/docker/docker/image/v1"

 	"github.com/docker/docker/layer"

 	"github.com/docker/docker/pkg/ioutils"

 	"github.com/docker/docker/pkg/progress"

@@ -428,17 +426,7 @@ func (p *puller) pullTag(ctx context.Context, ref reference.Named, platform *oci

 	switch v := manifest.(type) {

 	case *schema1.SignedManifest:

-		err := DeprecatedSchema1ImageError(ref)

-		log.G(ctx).Warn(err.Error())

-		if os.Getenv("DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE") == "" {

-			return false, err

-		}

-		progress.Message(p.config.ProgressOutput, "", err.Error())

-

-		id, manifestDigest, err = p.pullSchema1(ctx, ref, v, platform)

-		if err != nil {

-			return false, err

-		}

+		return false, DeprecatedSchema1ImageError(ref)

 	case *schema2.DeserializedManifest:

 		id, manifestDigest, err = p.pullSchema2(ctx, ref, v, platform)

 		if err != nil {

@@ -508,88 +496,6 @@ func (p *puller) validateMediaType(mediaType string) error {

 	return invalidManifestClassError{mediaType, configClass}

 }

-func (p *puller) pullSchema1(ctx context.Context, ref reference.Reference, unverifiedManifest *schema1.SignedManifest, platform *ocispec.Platform) (id digest.Digest, manifestDigest digest.Digest, _ error) {

-	if platform != nil {

-		// Early bath if the requested OS doesn't match that of the configuration.

-		// This avoids doing the download, only to potentially fail later.

-		if err := image.CheckOS(platform.OS); err != nil {

-			return "", "", fmt.Errorf("cannot download image with operating system %q when requesting %q", runtime.GOOS, platform.OS)

-		}

-	}

-

-	var verifiedManifest *schema1.Manifest

-	verifiedManifest, err := verifySchema1Manifest(ctx, unverifiedManifest, ref)

-	if err != nil {

-		return "", "", err

-	}

-

-	rootFS := image.NewRootFS()

-

-	// remove duplicate layers and check parent chain validity

-	err = fixManifestLayers(verifiedManifest)

-	if err != nil {

-		return "", "", err

-	}

-

-	var descriptors []xfer.DownloadDescriptor

-

-	// Image history converted to the new format

-	var history []image.History

-

-	// Note that the order of this loop is in the direction of bottom-most

-	// to top-most, so that the downloads slice gets ordered correctly.

-	for i := len(verifiedManifest.FSLayers) - 1; i >= 0; i-- {

-		blobSum := verifiedManifest.FSLayers[i].BlobSum

-		if err = blobSum.Validate(); err != nil {

-			return "", "", errors.Wrapf(err, "could not validate layer digest %q", blobSum)

-		}

-

-		var throwAway struct {

-			ThrowAway bool `json:"throwaway,omitempty"`

-		}

-		if err := json.Unmarshal([]byte(verifiedManifest.History[i].V1Compatibility), &throwAway); err != nil {

-			return "", "", err

-		}

-

-		h, err := v1.HistoryFromConfig([]byte(verifiedManifest.History[i].V1Compatibility), throwAway.ThrowAway)

-		if err != nil {

-			return "", "", err

-		}

-		history = append(history, h)

-

-		if throwAway.ThrowAway {

-			continue

-		}

-

-		descriptors = append(descriptors, &layerDescriptor{

-			digest:          blobSum,

-			repoName:        p.repoName,

-			repo:            p.repo,

-			metadataService: p.metadataService,

-		})

-	}

-

-	resultRootFS, release, err := p.config.DownloadManager.Download(ctx, *rootFS, descriptors, p.config.ProgressOutput)

-	if err != nil {

-		return "", "", err

-	}

-	defer release()

-

-	config, err := v1.MakeConfigFromV1Config([]byte(verifiedManifest.History[0].V1Compatibility), &resultRootFS, history)

-	if err != nil {

-		return "", "", err

-	}

-

-	imageID, err := p.config.ImageStore.Put(ctx, config)

-	if err != nil {

-		return "", "", err

-	}

-

-	manifestDigest = digest.FromBytes(unverifiedManifest.Canonical)

-

-	return imageID, manifestDigest, nil

-}

-

 func checkSupportedMediaType(mediaType string) error {

 	lowerMt := strings.ToLower(mediaType)

 	for _, mt := range supportedMediaTypes {

@@ -862,17 +768,7 @@ func (p *puller) pullManifestList(ctx context.Context, ref reference.Named, mfst

 		switch v := manifest.(type) {

 		case *schema1.SignedManifest:

-			err := DeprecatedSchema1ImageError(ref)

-			log.G(ctx).Warn(err.Error())

-			if os.Getenv("DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE") == "" {

-				return "", "", err

-			}

-			progress.Message(p.config.ProgressOutput, "", err.Error())

-

-			id, _, err = p.pullSchema1(ctx, manifestRef, v, toOCIPlatform(match.Platform))

-			if err != nil {

-				return "", "", err

-			}

+			return "", "", DeprecatedSchema1ImageError(ref)

 		case *schema2.DeserializedManifest:

 			id, _, err = p.pullSchema2(ctx, manifestRef, v, toOCIPlatform(match.Platform))

 			if err != nil {

@@ -999,83 +895,6 @@ func schema2ManifestDigest(ref reference.Named, mfst distribution.Manifest) (dig

 	return digest.FromBytes(canonical), nil

 }

-func verifySchema1Manifest(ctx context.Context, signedManifest *schema1.SignedManifest, ref reference.Reference) (*schema1.Manifest, error) {

-	// If pull by digest, then verify the manifest digest. NOTE: It is

-	// important to do this first, before any other content validation. If the

-	// digest cannot be verified, don't even bother with those other things.

-	if digested, isCanonical := ref.(reference.Canonical); isCanonical {

-		verifier := digested.Digest().Verifier()

-		if _, err := verifier.Write(signedManifest.Canonical); err != nil {

-			return nil, err

-		}

-		if !verifier.Verified() {

-			err := fmt.Errorf("image verification failed for digest %s", digested.Digest())

-			log.G(ctx).Error(err)

-			return nil, err

-		}

-	}

-

-	m := &signedManifest.Manifest

-	if m.SchemaVersion != 1 {

-		return nil, fmt.Errorf("unsupported schema version %d for %q", m.SchemaVersion, reference.FamiliarString(ref))

-	}

-	if len(m.FSLayers) != len(m.History) {

-		return nil, fmt.Errorf("length of history not equal to number of layers for %q", reference.FamiliarString(ref))

-	}

-	if len(m.FSLayers) == 0 {

-		return nil, fmt.Errorf("no FSLayers in manifest for %q", reference.FamiliarString(ref))

-	}

-	return m, nil

-}

-

-// fixManifestLayers removes repeated layers from the manifest and checks the

-// correctness of the parent chain.

-func fixManifestLayers(m *schema1.Manifest) error {

-	imgs := make([]*image.V1Image, len(m.FSLayers))

-	for i := range m.FSLayers {

-		img := &image.V1Image{}

-

-		if err := json.Unmarshal([]byte(m.History[i].V1Compatibility), img); err != nil {

-			return err

-		}

-

-		imgs[i] = img

-		if err := v1.ValidateID(img.ID); err != nil {

-			return err

-		}

-	}

-

-	if imgs[len(imgs)-1].Parent != "" && runtime.GOOS != "windows" {

-		// Windows base layer can point to a base layer parent that is not in manifest.

-		return errors.New("invalid parent ID in the base layer of the image")

-	}

-

-	// check general duplicates to error instead of a deadlock

-	idmap := make(map[string]struct{})

-

-	var lastID string

-	for _, img := range imgs {

-		// skip IDs that appear after each other, we handle those later

-		if _, exists := idmap[img.ID]; img.ID != lastID && exists {

-			return fmt.Errorf("ID %+v appears multiple times in manifest", img.ID)

-		}

-		lastID = img.ID

-		idmap[lastID] = struct{}{}

-	}

-

-	// backwards loop so that we keep the remaining indexes after removing items

-	for i := len(imgs) - 2; i >= 0; i-- {

-		if imgs[i].ID == imgs[i+1].ID { // repeated ID. remove and continue

-			m.FSLayers = append(m.FSLayers[:i], m.FSLayers[i+1:]...)

-			m.History = append(m.History[:i], m.History[i+1:]...)

-		} else if imgs[i].Parent != imgs[i+1].ID {

-			return fmt.Errorf("invalid parent ID. Expected %v, got %v", imgs[i+1].ID, imgs[i].Parent)

-		}

-	}

-

-	return nil

-}

-

 func createDownloadFile() (*os.File, error) {

 	return os.CreateTemp("", "GetImageBlob")

 }

@@ -2,20 +2,15 @@ package distribution // import "github.com/docker/docker/distribution"

 import (

 	"context"

-	"encoding/json"

 	"net/http"

 	"net/http/httptest"

 	"net/url"

-	"os"

-	"reflect"

 	"runtime"

 	"strings"

 	"sync/atomic"

 	"testing"

-	"github.com/containerd/log/logtest"

 	"github.com/distribution/reference"

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

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

 	"github.com/docker/docker/image"

 	"github.com/docker/docker/registry"

@@ -25,177 +20,6 @@ import (

 	is "gotest.tools/v3/assert/cmp"

 )

-// TestFixManifestLayers checks that fixManifestLayers removes a duplicate

-// layer, and that it makes no changes to the manifest when called a second

-// time, after the duplicate is removed.

-func TestFixManifestLayers(t *testing.T) {

-	duplicateLayerManifest := schema1.Manifest{

-		FSLayers: []schema1.FSLayer{

-			{BlobSum: digest.Digest("sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4")},

-			{BlobSum: digest.Digest("sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4")},

-			{BlobSum: digest.Digest("sha256:86e0e091d0da6bde2456dbb48306f3956bbeb2eae1b5b9a43045843f69fe4aaa")},

-		},

-		History: []schema1.History{

-			{V1Compatibility: "{\"id\":\"3b38edc92eb7c074812e217b41a6ade66888531009d6286a6f5f36a06f9841b9\",\"parent\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"created\":\"2015-08-19T16:49:11.368300679Z\",\"container\":\"d91be3479d5b1e84b0c00d18eea9dc777ca0ad166d51174b24283e2e6f104253\",\"container_config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) ENTRYPOINT [\\\"/go/bin/dnsdock\\\"]\"],\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"docker_version\":\"1.6.2\",\"config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":null,\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":0}\n"},

-			{V1Compatibility: "{\"id\":\"3b38edc92eb7c074812e217b41a6ade66888531009d6286a6f5f36a06f9841b9\",\"parent\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"created\":\"2015-08-19T16:49:11.368300679Z\",\"container\":\"d91be3479d5b1e84b0c00d18eea9dc777ca0ad166d51174b24283e2e6f104253\",\"container_config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) ENTRYPOINT [\\\"/go/bin/dnsdock\\\"]\"],\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"docker_version\":\"1.6.2\",\"config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":null,\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":0}\n"},

-			{V1Compatibility: "{\"id\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"created\":\"2015-08-19T16:49:07.568027497Z\",\"container\":\"fe9e5a5264a843c9292d17b736c92dd19bdb49986a8782d7389964ddaff887cc\",\"container_config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/sh\",\"-c\",\"cd /go/src/github.com/tonistiigi/dnsdock \\u0026\\u0026     go get -v github.com/tools/godep \\u0026\\u0026     godep restore \\u0026\\u0026     go install -ldflags \\\"-X main.version `git describe --tags HEAD``if [[ -n $(command git status --porcelain --untracked-files=no 2\\u003e/dev/null) ]]; then echo \\\"-dirty\\\"; fi`\\\" ./...\"],\"Image\":\"e3b0ff09e647595dafee15c54cd632c900df9e82b1d4d313b1e20639a1461779\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"docker_version\":\"1.6.2\",\"config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/bash\"],\"Image\":\"e3b0ff09e647595dafee15c54cd632c900df9e82b1d4d313b1e20639a1461779\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":118430532}\n"},

-		},

-	}

-

-	duplicateLayerManifestExpectedOutput := schema1.Manifest{

-		FSLayers: []schema1.FSLayer{

-			{BlobSum: digest.Digest("sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4")},

-			{BlobSum: digest.Digest("sha256:86e0e091d0da6bde2456dbb48306f3956bbeb2eae1b5b9a43045843f69fe4aaa")},

-		},

-		History: []schema1.History{

-			{V1Compatibility: "{\"id\":\"3b38edc92eb7c074812e217b41a6ade66888531009d6286a6f5f36a06f9841b9\",\"parent\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"created\":\"2015-08-19T16:49:11.368300679Z\",\"container\":\"d91be3479d5b1e84b0c00d18eea9dc777ca0ad166d51174b24283e2e6f104253\",\"container_config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) ENTRYPOINT [\\\"/go/bin/dnsdock\\\"]\"],\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"docker_version\":\"1.6.2\",\"config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":null,\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":0}\n"},

-			{V1Compatibility: "{\"id\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"created\":\"2015-08-19T16:49:07.568027497Z\",\"container\":\"fe9e5a5264a843c9292d17b736c92dd19bdb49986a8782d7389964ddaff887cc\",\"container_config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/sh\",\"-c\",\"cd /go/src/github.com/tonistiigi/dnsdock \\u0026\\u0026     go get -v github.com/tools/godep \\u0026\\u0026     godep restore \\u0026\\u0026     go install -ldflags \\\"-X main.version `git describe --tags HEAD``if [[ -n $(command git status --porcelain --untracked-files=no 2\\u003e/dev/null) ]]; then echo \\\"-dirty\\\"; fi`\\\" ./...\"],\"Image\":\"e3b0ff09e647595dafee15c54cd632c900df9e82b1d4d313b1e20639a1461779\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"docker_version\":\"1.6.2\",\"config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/bash\"],\"Image\":\"e3b0ff09e647595dafee15c54cd632c900df9e82b1d4d313b1e20639a1461779\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":118430532}\n"},

-		},

-	}

-

-	if err := fixManifestLayers(&duplicateLayerManifest); err != nil {

-		t.Fatalf("unexpected error from fixManifestLayers: %v", err)

-	}

-

-	if !reflect.DeepEqual(duplicateLayerManifest, duplicateLayerManifestExpectedOutput) {

-		t.Fatal("incorrect output from fixManifestLayers on duplicate layer manifest")

-	}

-

-	// Run fixManifestLayers again and confirm that it doesn't change the

-	// manifest (which no longer has duplicate layers).

-	if err := fixManifestLayers(&duplicateLayerManifest); err != nil {

-		t.Fatalf("unexpected error from fixManifestLayers: %v", err)

-	}

-

-	if !reflect.DeepEqual(duplicateLayerManifest, duplicateLayerManifestExpectedOutput) {

-		t.Fatal("incorrect output from fixManifestLayers on duplicate layer manifest (second pass)")

-	}

-}

-

-// TestFixManifestLayersBaseLayerParent makes sure that fixManifestLayers fails

-// if the base layer configuration specifies a parent.

-func TestFixManifestLayersBaseLayerParent(t *testing.T) {

-	// TODO Windows: Fix this unit text

-	if runtime.GOOS == "windows" {

-		t.Skip("Needs fixing on Windows")

-	}

-	duplicateLayerManifest := schema1.Manifest{

-		FSLayers: []schema1.FSLayer{

-			{BlobSum: digest.Digest("sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4")},

-			{BlobSum: digest.Digest("sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4")},

-			{BlobSum: digest.Digest("sha256:86e0e091d0da6bde2456dbb48306f3956bbeb2eae1b5b9a43045843f69fe4aaa")},

-		},

-		History: []schema1.History{

-			{V1Compatibility: "{\"id\":\"3b38edc92eb7c074812e217b41a6ade66888531009d6286a6f5f36a06f9841b9\",\"parent\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"created\":\"2015-08-19T16:49:11.368300679Z\",\"container\":\"d91be3479d5b1e84b0c00d18eea9dc777ca0ad166d51174b24283e2e6f104253\",\"container_config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) ENTRYPOINT [\\\"/go/bin/dnsdock\\\"]\"],\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"docker_version\":\"1.6.2\",\"config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":null,\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":0}\n"},

-			{V1Compatibility: "{\"id\":\"3b38edc92eb7c074812e217b41a6ade66888531009d6286a6f5f36a06f9841b9\",\"parent\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"created\":\"2015-08-19T16:49:11.368300679Z\",\"container\":\"d91be3479d5b1e84b0c00d18eea9dc777ca0ad166d51174b24283e2e6f104253\",\"container_config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) ENTRYPOINT [\\\"/go/bin/dnsdock\\\"]\"],\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"docker_version\":\"1.6.2\",\"config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":null,\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":0}\n"},

-			{V1Compatibility: "{\"id\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"parent\":\"e3b0ff09e647595dafee15c54cd632c900df9e82b1d4d313b1e20639a1461779\",\"created\":\"2015-08-19T16:49:07.568027497Z\",\"container\":\"fe9e5a5264a843c9292d17b736c92dd19bdb49986a8782d7389964ddaff887cc\",\"container_config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/sh\",\"-c\",\"cd /go/src/github.com/tonistiigi/dnsdock \\u0026\\u0026     go get -v github.com/tools/godep \\u0026\\u0026     godep restore \\u0026\\u0026     go install -ldflags \\\"-X main.version `git describe --tags HEAD``if [[ -n $(command git status --porcelain --untracked-files=no 2\\u003e/dev/null) ]]; then echo \\\"-dirty\\\"; fi`\\\" ./...\"],\"Image\":\"e3b0ff09e647595dafee15c54cd632c900df9e82b1d4d313b1e20639a1461779\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"docker_version\":\"1.6.2\",\"config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/bash\"],\"Image\":\"e3b0ff09e647595dafee15c54cd632c900df9e82b1d4d313b1e20639a1461779\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":118430532}\n"},

-		},

-	}

-

-	if err := fixManifestLayers(&duplicateLayerManifest); err == nil || !strings.Contains(err.Error(), "invalid parent ID in the base layer of the image") {

-		t.Fatalf("expected an invalid parent ID error from fixManifestLayers")

-	}

-}

-

-// TestFixManifestLayersBadParent makes sure that fixManifestLayers fails

-// if an image configuration specifies a parent that doesn't directly follow

-// that (deduplicated) image in the image history.

-func TestFixManifestLayersBadParent(t *testing.T) {

-	duplicateLayerManifest := schema1.Manifest{

-		FSLayers: []schema1.FSLayer{

-			{BlobSum: digest.Digest("sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4")},

-			{BlobSum: digest.Digest("sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4")},

-			{BlobSum: digest.Digest("sha256:86e0e091d0da6bde2456dbb48306f3956bbeb2eae1b5b9a43045843f69fe4aaa")},

-		},

-		History: []schema1.History{

-			{V1Compatibility: "{\"id\":\"3b38edc92eb7c074812e217b41a6ade66888531009d6286a6f5f36a06f9841b9\",\"parent\":\"ac3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"created\":\"2015-08-19T16:49:11.368300679Z\",\"container\":\"d91be3479d5b1e84b0c00d18eea9dc777ca0ad166d51174b24283e2e6f104253\",\"container_config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) ENTRYPOINT [\\\"/go/bin/dnsdock\\\"]\"],\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"docker_version\":\"1.6.2\",\"config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":null,\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":0}\n"},

-			{V1Compatibility: "{\"id\":\"3b38edc92eb7c074812e217b41a6ade66888531009d6286a6f5f36a06f9841b9\",\"parent\":\"ac3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"created\":\"2015-08-19T16:49:11.368300679Z\",\"container\":\"d91be3479d5b1e84b0c00d18eea9dc777ca0ad166d51174b24283e2e6f104253\",\"container_config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) ENTRYPOINT [\\\"/go/bin/dnsdock\\\"]\"],\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"docker_version\":\"1.6.2\",\"config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":null,\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":0}\n"},

-			{V1Compatibility: "{\"id\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"created\":\"2015-08-19T16:49:07.568027497Z\",\"container\":\"fe9e5a5264a843c9292d17b736c92dd19bdb49986a8782d7389964ddaff887cc\",\"container_config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/sh\",\"-c\",\"cd /go/src/github.com/tonistiigi/dnsdock \\u0026\\u0026     go get -v github.com/tools/godep \\u0026\\u0026     godep restore \\u0026\\u0026     go install -ldflags \\\"-X main.version `git describe --tags HEAD``if [[ -n $(command git status --porcelain --untracked-files=no 2\\u003e/dev/null) ]]; then echo \\\"-dirty\\\"; fi`\\\" ./...\"],\"Image\":\"e3b0ff09e647595dafee15c54cd632c900df9e82b1d4d313b1e20639a1461779\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"docker_version\":\"1.6.2\",\"config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/bash\"],\"Image\":\"e3b0ff09e647595dafee15c54cd632c900df9e82b1d4d313b1e20639a1461779\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":118430532}\n"},

-		},

-	}

-

-	err := fixManifestLayers(&duplicateLayerManifest)

-	assert.Check(t, is.ErrorContains(err, "invalid parent ID"))

-}

-

-// TestValidateManifest verifies the validateManifest function

-func TestValidateManifest(t *testing.T) {

-	// TODO Windows: Fix this unit text

-	if runtime.GOOS == "windows" {

-		t.Skip("Needs fixing on Windows")

-	}

-	ctx := context.TODO()

-	ctx = logtest.WithT(ctx, t)

-

-	expectedDigest, err := reference.ParseNormalizedNamed("repo@sha256:02fee8c3220ba806531f606525eceb83f4feb654f62b207191b1c9209188dedd")

-	if err != nil {

-		t.Fatal("could not parse reference")

-	}

-	expectedFSLayer0 := digest.Digest("sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4")

-

-	// Good manifest

-

-	goodManifestBytes, err := os.ReadFile("fixtures/validate_manifest/good_manifest")

-	if err != nil {

-		t.Fatal("error reading fixture:", err)

-	}

-

-	var goodSignedManifest schema1.SignedManifest

-	err = json.Unmarshal(goodManifestBytes, &goodSignedManifest)

-	if err != nil {

-		t.Fatal("error unmarshaling manifest:", err)

-	}

-

-	verifiedManifest, err := verifySchema1Manifest(ctx, &goodSignedManifest, expectedDigest)

-	if err != nil {

-		t.Fatal("validateManifest failed:", err)

-	}

-

-	if verifiedManifest.FSLayers[0].BlobSum != expectedFSLayer0 {

-		t.Fatal("unexpected FSLayer in good manifest")

-	}

-

-	// "Extra data" manifest

-

-	extraDataManifestBytes, err := os.ReadFile("fixtures/validate_manifest/extra_data_manifest")

-	if err != nil {

-		t.Fatal("error reading fixture:", err)

-	}

-

-	var extraDataSignedManifest schema1.SignedManifest

-	err = json.Unmarshal(extraDataManifestBytes, &extraDataSignedManifest)

-	if err != nil {

-		t.Fatal("error unmarshaling manifest:", err)

-	}

-

-	verifiedManifest, err = verifySchema1Manifest(ctx, &extraDataSignedManifest, expectedDigest)

-	if err != nil {

-		t.Fatal("validateManifest failed:", err)

-	}

-

-	if verifiedManifest.FSLayers[0].BlobSum != expectedFSLayer0 {

-		t.Fatal("unexpected FSLayer in extra data manifest")

-	}

-

-	// Bad manifest

-

-	badManifestBytes, err := os.ReadFile("fixtures/validate_manifest/bad_manifest")

-	if err != nil {

-		t.Fatal("error reading fixture:", err)

-	}

-

-	var badSignedManifest schema1.SignedManifest

-	err = json.Unmarshal(badManifestBytes, &badSignedManifest)

-	if err != nil {

-		t.Fatal("error unmarshaling manifest:", err)

-	}

-

-	_, err = verifySchema1Manifest(ctx, &badSignedManifest, expectedDigest)

-	if err == nil || !strings.HasPrefix(err.Error(), "image verification failed for digest") {

-		t.Fatal("expected validateManifest to fail with digest error")

-	}

-}

-

 func TestNoMatchesErr(t *testing.T) {

 	err := noMatchesErr{}

 	assert.Check(t, is.ErrorContains(err, "no matching manifest for "+runtime.GOOS))

@@ -40,15 +40,9 @@ fi

 # intentionally open a couple bogus file descriptors to help test that they get scrubbed in containers

 exec 41>&1 42>&2

-# Allow pushing manifest v2 schema 1 images, as they're used to push

-# images to our test-registries for testing _pulling_ schema 2v1 images.

-export DOCKER_ALLOW_SCHEMA1_PUSH_DONOTUSE=1

 export DOCKER_GRAPHDRIVER=${DOCKER_GRAPHDRIVER:-vfs}

 export DOCKER_USERLANDPROXY=${DOCKER_USERLANDPROXY:-true}

-# Allow testing push/pull of legacy image formats

-export DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE=1

-

 # example usage: DOCKER_STORAGE_OPTS="dm.basesize=20G,dm.loopdatasize=200G"

 storage_params=""

 if [ -n "$DOCKER_STORAGE_OPTS" ]; then

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

 	"go.opentelemetry.io/otel/attribute"

 	"go.opentelemetry.io/otel/codes"

 	"gotest.tools/v3/assert"

-	"gotest.tools/v3/skip"

 )

 const (

@@ -364,13 +363,6 @@ func TestDockerRegistrySuite(t *testing.T) {

 	suite.Run(ctx, t, &DockerRegistrySuite{ds: &DockerSuite{}})

 }

-func TestDockerSchema1RegistrySuite(t *testing.T) {

-	skip.If(t, testEnv.UsingSnapshotter())

-	ctx := testutil.StartSpan(baseContext, t)

-	ensureTestEnvSetup(ctx, t)

-	suite.Run(ctx, t, &DockerSchema1RegistrySuite{ds: &DockerSuite{}})

-}

-

 func TestDockerRegistryAuthHtpasswdSuite(t *testing.T) {

 	ctx := testutil.StartSpan(baseContext, t)

 	ensureTestEnvSetup(ctx, t)

@@ -478,33 +470,6 @@ func (s *DockerRegistrySuite) TearDownTest(ctx context.Context, c *testing.T) {

 	s.ds.TearDownTest(ctx, c)

 }

-type DockerSchema1RegistrySuite struct {

-	ds  *DockerSuite

-	reg *registry.V2

-	d   *daemon.Daemon

-}

-

-func (s *DockerSchema1RegistrySuite) OnTimeout(c *testing.T) {

-	s.d.DumpStackAndQuit()

-}

-

-func (s *DockerSchema1RegistrySuite) SetUpTest(ctx context.Context, c *testing.T) {

-	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(ctx context.Context, c *testing.T) {

-	if s.reg != nil {

-		s.reg.Close()

-	}

-	if s.d != nil {

-		s.d.Stop(c)

-	}

-	s.ds.TearDownTest(ctx, c)

-}

-

 type DockerRegistryAuthHtpasswdSuite struct {

 	ds  *DockerSuite

 	reg *registry.V2

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

 	"strings"

 	"testing"

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

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

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

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

@@ -63,7 +62,7 @@ func setupImageWithTag(c *testing.T, tag string) (digest.Digest, error) {

 	return digest.Digest(pushDigest), nil

 }

-func testPullByTagDisplaysDigest(c *testing.T) {

+func (s *DockerRegistrySuite) TestPullByTagDisplaysDigest(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	pushDigest, err := setupImage(c)

 	assert.NilError(c, err, "error setting up image")

@@ -80,15 +79,7 @@ func testPullByTagDisplaysDigest(c *testing.T) {

 	assert.Equal(c, pushDigest.String(), pullDigest)

 }

-func (s *DockerRegistrySuite) TestPullByTagDisplaysDigest(c *testing.T) {

-	testPullByTagDisplaysDigest(c)

-}

-

-func (s *DockerSchema1RegistrySuite) TestPullByTagDisplaysDigest(c *testing.T) {

-	testPullByTagDisplaysDigest(c)

-}

-

-func testPullByDigest(c *testing.T) {

+func (s *DockerRegistrySuite) TestPullByDigest(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	pushDigest, err := setupImage(c)

 	assert.NilError(c, err, "error setting up image")

@@ -106,15 +97,7 @@ func testPullByDigest(c *testing.T) {

 	assert.Equal(c, pushDigest.String(), pullDigest)

 }

-func (s *DockerRegistrySuite) TestPullByDigest(c *testing.T) {

-	testPullByDigest(c)

-}