Allow to skip manifest schema V2 push

Signed-off-by: Antonio Murdaca <runcom@redhat.com>

Author: runcom

daemon/config.go

@@ -107,6 +107,7 @@ type CommonConfig struct {
 	LiveRestoreEnabled   bool     `json:"live-restore,omitempty"`
 	BlockedRegistries    []string `json:"block-registry,omitempty"`
 	AdditionalRegistries []string `json:"add-registry,omitempty"`
+	SkipSchemaV2Push     bool     `json:"skip-schema2-push"`
 
 	// ClusterStore is the storage backend used for the cluster information. It is used by both
 	// multihost networking (to store networks and endpoints information) and by the node discovery
@@ -202,6 +203,7 @@ func (config *Config) InstallCommonFlags(flags *pflag.FlagSet) {
 
 	flags.Var(opts.NewListOptsRef(&config.BlockedRegistries, registry.ValidateIndexName), "block-registry", "Don't contact given registry")
 	flags.Var(opts.NewListOptsRef(&config.AdditionalRegistries, registry.ValidateIndexName), "add-registry", "Registry to query before a public one")
+	flags.BoolVar(&config.SkipSchemaV2Push, "skip-schema2-push", false, "override push behavior to push only schema1 manifests")
 }
 
 // IsValueSet returns true if a configuration value

daemon/image_push.go

@@ -54,6 +54,7 @@ func (daemon *Daemon) PushImage(ctx context.Context, image, tag string, metaHead
 		LayerStore:      distribution.NewLayerProviderFromStore(daemon.layerStore),
 		TrustKey:        daemon.trustKey,
 		UploadManager:   daemon.uploadManager,
+		SkipSchemaV2:    daemon.configStore.SkipSchemaV2Push,
 	}
 
 	err = distribution.Push(ctx, ref, imagePushConfig)

distribution/push_v2.go

@@ -174,40 +174,55 @@ func (p *v2Pusher) pushV2Tag(ctx context.Context, ref reference.NamedTagged, id
 		return err
 	}
 
-	// Try schema2 first
-	builder := schema2.NewManifestBuilder(p.repo.Blobs(ctx), p.config.ConfigMediaType, imgConfig)
-	manifest, err := manifestFromBuilder(ctx, builder, descriptors)
-	if err != nil {
-		return err
-	}
-
 	manSvc, err := p.repo.Manifests(ctx)
 	if err != nil {
 		return err
 	}
 
-	putOptions := []distribution.ManifestServiceOption{distribution.WithTag(ref.Tag())}
-	if _, err = manSvc.Put(ctx, manifest, putOptions...); err != nil {
-		if runtime.GOOS == "windows" || p.config.TrustKey == nil || p.config.RequireSchema2 {
-			logrus.Warnf("failed to upload schema2 manifest: %v", err)
-			return err
-		}
-
-		logrus.Warnf("failed to upload schema2 manifest: %v - falling back to schema1", err)
-
+	var (
+		manifest   distribution.Manifest
+		putOptions = []distribution.ManifestServiceOption{distribution.WithTag(ref.Tag())}
+	)
+	if p.config.SkipSchemaV2 {
 		manifestRef, err := distreference.WithTag(p.repo.Named(), ref.Tag())
 		if err != nil {
 			return err
 		}
-		builder = schema1.NewConfigManifestBuilder(p.repo.Blobs(ctx), p.config.TrustKey, manifestRef, imgConfig)
+		builder := schema1.NewConfigManifestBuilder(p.repo.Blobs(ctx), p.config.TrustKey, manifestRef, imgConfig)
 		manifest, err = manifestFromBuilder(ctx, builder, descriptors)
 		if err != nil {
 			return err
 		}
-
 		if _, err = manSvc.Put(ctx, manifest, putOptions...); err != nil {
 			return err
 		}
+	} else {
+		builder := schema2.NewManifestBuilder(p.repo.Blobs(ctx), p.config.ConfigMediaType, imgConfig)
+		manifest, err = manifestFromBuilder(ctx, builder, descriptors)
+		if err != nil {
+			return err
+		}
+		if _, err = manSvc.Put(ctx, manifest, putOptions...); err != nil {
+			if runtime.GOOS == "windows" {
+				logrus.Warnf("failed to upload schema2 manifest: %v", err)
+				return err
+			}
+
+			logrus.Warnf("failed to upload schema2 manifest: %v - falling back to schema1", err)
+
+			manifestRef, err := distreference.WithTag(p.repo.Named(), ref.Tag())
+			if err != nil {
+				return err
+			}
+			builder = schema1.NewConfigManifestBuilder(p.repo.Blobs(ctx), p.config.TrustKey, manifestRef, imgConfig)
+			manifest, err = manifestFromBuilder(ctx, builder, descriptors)
+			if err != nil {
+				return err
+			}
+			if _, err = manSvc.Put(ctx, manifest, putOptions...); err != nil {
+				return err
+			}
+		}
 	}
 
 	var canonicalManifest []byte

integration-cli/docker_cli_push_test.go

@@ -855,3 +855,55 @@ func (s *DockerRegistriesSuite) TestPushNeedsAuth(c *check.C) {
 		c.Fatalf("Wanted %s, got %s", expected, out)
 	}
 }
+
+func (s *DockerRegistrySuite) TestPushWithSkipSchema2(c *check.C) {
+	c.Assert(s.d.StartWithBusybox("--skip-schema2-push=false"), check.IsNil)
+
+	repo := fmt.Sprintf("%s/runcom/busybox", s.reg.url)
+	out, err := s.d.Cmd("tag", "busybox", repo)
+	c.Assert(err, check.IsNil, check.Commentf(out))
+
+	out, err = s.d.Cmd("push", repo)
+	c.Assert(err, check.IsNil, check.Commentf(out))
+
+	digest1 := reference.DigestRegexp.FindString(out)
+	c.Assert(len(digest1), checker.GreaterThan, 0, check.Commentf("no digest found for pushed manifest"))
+
+	out, err = s.d.Cmd("pull", repo+"@"+digest1)
+	c.Assert(err, check.IsNil, check.Commentf(out))
+
+	out, err = s.d.Cmd("rmi", "-f", repo+"@"+digest1)
+	c.Assert(err, check.IsNil, check.Commentf(out))
+
+	c.Assert(s.d.Restart("--skip-schema2-push=true"), check.IsNil)
+
+	out, err = s.d.Cmd("push", repo)
+	c.Assert(err, check.IsNil, check.Commentf(out))
+
+	digest2 := reference.DigestRegexp.FindString(out)
+	c.Assert(len(digest2), checker.GreaterThan, 0, check.Commentf("no digest found for pushed manifest"))
+
+	out, err = s.d.Cmd("pull", repo+"@"+digest2)
+	c.Assert(err, check.IsNil, check.Commentf(out))
+
+	out, err = s.d.Cmd("rmi", "-f", repo+"@"+digest2)
+	c.Assert(err, check.IsNil, check.Commentf(out))
+
+	c.Assert(digest1, check.Not(checker.Equals), digest2)
+
+	c.Assert(s.d.Restart(), check.IsNil)
+
+	out, err = s.d.Cmd("push", repo)
+	c.Assert(err, check.IsNil, check.Commentf(out))
+
+	digest3 := reference.DigestRegexp.FindString(out)
+	c.Assert(len(digest3), checker.GreaterThan, 0, check.Commentf("no digest found for pushed manifest"))
+
+	out, err = s.d.Cmd("pull", repo+"@"+digest3)
+	c.Assert(err, check.IsNil, check.Commentf(out))
+
+	out, err = s.d.Cmd("rmi", "-f", repo+"@"+digest3)
+	c.Assert(err, check.IsNil, check.Commentf(out))
+
+	c.Assert(digest1, checker.Equals, digest3)
+}