Revert "Hotfix: Do not fetch manifest lists from Docker registries"

mtrmac · mtrmac · commit ff6008a477c5 · 2017-11-15T20:06:05.000+01:00
This reverts commit bf1ca2e. We can now process the manifest lists ourselves. Because docker_transport_test.go tests "//busybox".NewImage(), which will now process transport lists, also add an architecture/OS override to keep the test working e.g. on macOS, for which Docker does not publish an image in the manifest list. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
diff --git a/docker/docker_transport_test.go b/docker/docker_transport_test.go
@@ -152,7 +152,12 @@ func TestReferencePolicyConfigurationNamespaces(t *testing.T) {
 func TestReferenceNewImage(t *testing.T) {
 	ref, err := ParseReference("//busybox")
 	require.NoError(t, err)
-	img, err := ref.NewImage(&types.SystemContext{RegistriesDirPath: "/this/doesnt/exist", DockerPerHostCertDirPath: "/this/doesnt/exist"})
+	img, err := ref.NewImage(&types.SystemContext{
+		RegistriesDirPath:        "/this/doesnt/exist",
+		DockerPerHostCertDirPath: "/this/doesnt/exist",
+		ArchitectureChoice:       "amd64",
+		OSChoice:                 "linux",
+	})
 	require.NoError(t, err)
 	defer img.Close()
 }
diff --git a/manifest/manifest.go b/manifest/manifest.go
@@ -35,7 +35,7 @@ var DefaultRequestedManifestMIMETypes = []string{
 	DockerV2Schema2MediaType,
 	DockerV2Schema1SignedMediaType,
 	DockerV2Schema1MediaType,
-	// DockerV2ListMediaType, // FIXME: Restore this ASAP
+	DockerV2ListMediaType,
 }
 
 // GuessMIMEType guesses MIME type of a manifest and returns it _if it is recognized_, or "" if unknown or unrecognized.

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ var DefaultRequestedManifestMIMETypes = []string{`
`35`	`35`	`DockerV2Schema2MediaType,`
`36`	`36`	`DockerV2Schema1SignedMediaType,`
`37`	`37`	`DockerV2Schema1MediaType,`
`38`		`- // DockerV2ListMediaType, // FIXME: Restore this ASAP`
	`38`	`+ DockerV2ListMediaType,`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`// GuessMIMEType guesses MIME type of a manifest and returns it _if it is recognized_, or "" if unknown or unrecognized.`