c8d/convert: Accept multiple tags as destination

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
moby · May 16, 2024 · 67c33f8 · 67c33f8
1 parent 2d4184e
commit 67c33f8
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 41 deletions.
diff --git a/api/server/router/image/backend.go b/api/server/router/image/backend.go
@@ -29,7 +29,7 @@ type imageBackend interface {
 	GetImage(ctx context.Context, refOrID string, options backend.GetImageOpts) (*dockerimage.Image, error)
 	TagImage(ctx context.Context, id dockerimage.ID, newRef reference.Named) error
 	ImagesPrune(ctx context.Context, pruneFilters filters.Args) (*types.ImagesPruneReport, error)
-	ImageConvert(ctx context.Context, src string, dst reference.NamedTagged, options image.ConvertOptions) error
+	ImageConvert(ctx context.Context, src string, dsts []reference.NamedTagged, options image.ConvertOptions) error
 }
 
 type importExportBackend interface {

diff --git a/api/server/router/image/image_routes.go b/api/server/router/image/image_routes.go
@@ -535,11 +535,16 @@ func (ir *imageRouter) postImagesConvert(ctx context.Context, w http.ResponseWri
 	}
 
 	src := r.Form.Get("from")
-	dst, err := reference.ParseNamed(r.Form.Get("to"))
-	if err != nil {
-		return errdefs.InvalidParameter(fmt.Errorf("invalid 'to' parameter: %w", err))
+
+	var dstRefs []reference.Named
+	for _, t := range r.Form["to"] {
+		dst, err := reference.ParseNamed(r.Form.Get("to"))
+		if err != nil {
+			return errdefs.InvalidParameter(fmt.Errorf("invalid 'to' parameter: %w", err))
+		}
+
+		dstRefs = append(dstRefs, dst)
 	}
-	dstRef := dst.(reference.NamedTagged)
 
 	opts := imagetypes.ConvertOptions{
 		OnlyAvailablePlatforms: httputils.BoolValue(r, "only-available-platforms"),
@@ -554,7 +559,7 @@ func (ir *imageRouter) postImagesConvert(ctx context.Context, w http.ResponseWri
 		opts.Platforms = append(opts.Platforms, sp)
 	}
 
-	if err := ir.backend.ImageConvert(ctx, src, dstRef, opts); err != nil {
+	if err := ir.backend.ImageConvert(ctx, src, dstRefs, opts); err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		return err
 	}

diff --git a/client/image_convert.go b/client/image_convert.go
@@ -13,7 +13,7 @@ import (
 )
 
 // ImageList converts image.
-func (cli *Client) ImageConvert(ctx context.Context, src string, dst reference.NamedTagged, options image.ConvertOptions) error {
+func (cli *Client) ImageConvert(ctx context.Context, src string, dsts []reference.NamedTagged, options image.ConvertOptions) error {
 	query := url.Values{}
 
 	if options.OnlyAvailablePlatforms && len(options.Platforms) > 0 {
@@ -35,7 +35,9 @@ func (cli *Client) ImageConvert(ctx context.Context, src string, dst reference.N
 	}
 
 	query.Set("from", src)
-	query.Set("to", dst.String())
+	for _, dst := range dsts {
+		query.Add("to", dst.String())
+	}
 
 	serverResp, err := cli.post(ctx, "/images/convert", query, nil, nil)
 	ensureReaderClosed(serverResp)

diff --git a/client/interface.go b/client/interface.go
@@ -104,7 +104,7 @@ type ImageAPIClient interface {
 	ImageSave(ctx context.Context, images []string) (io.ReadCloser, error)
 	ImageTag(ctx context.Context, image, ref string) error
 	ImagesPrune(ctx context.Context, pruneFilter filters.Args) (types.ImagesPruneReport, error)
-	ImageConvert(ctx context.Context, src string, dst reference.NamedTagged, options image.ConvertOptions) error
+	ImageConvert(ctx context.Context, src string, dst []reference.NamedTagged, options image.ConvertOptions) error
 }
 
 // NetworkAPIClient defines API client methods for the networks

diff --git a/daemon/containerd/image_convert.go b/daemon/containerd/image_convert.go
@@ -19,21 +19,14 @@ import (
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
-func (i *ImageService) ImageConvert(ctx context.Context, src string, dst reference.NamedTagged, opts imagetypes.ConvertOptions) error {
+func (i *ImageService) ImageConvert(ctx context.Context, src string, dsts []reference.NamedTagged, opts imagetypes.ConvertOptions) error {
 	log.G(ctx).Debugf("converting: %+v", opts)
 
 	srcImg, err := i.resolveImage(ctx, src)
 	if err != nil {
 		return err
 	}
 
-	if _, err := i.images.Get(ctx, dst.String()); !cerrdefs.IsNotFound(err) {
-		err := i.images.Delete(ctx, dst.String(), images.SynchronousDelete())
-		if err != nil {
-			return errdefs.System(fmt.Errorf("failed to delete existing image: %w", err))
-		}
-	}
-
 	if opts.OnlyAvailablePlatforms && len(opts.Platforms) > 0 {
 		return errdefs.InvalidParameter(errors.New("specifying both explicit platform list and only-available-platforms is not allowed"))
 	}
@@ -49,7 +42,6 @@ func (i *ImageService) ImageConvert(ctx context.Context, src string, dst referen
 	}
 
 	newImg := srcImg
-	newImg.Name = dst.String()
 
 	n, err := i.convertManifests(ctx, srcImg, opts)
 	if err != nil {
@@ -68,8 +60,21 @@ func (i *ImageService) ImageConvert(ctx context.Context, src string, dst referen
 		newImg.UpdatedAt = newImg.CreatedAt
 	}
 
-	if _, err := i.images.Create(ctx, newImg); err != nil {
-		return errdefs.System(fmt.Errorf("failed to create image: %w", err))
+	for _, dst := range dsts {
+		newImg.Name = dst.String()
+
+		if _, err := i.images.Create(ctx, newImg); err != nil {
+			if cerrdefs.IsAlreadyExists(err) {
+				_, err := i.ImageDelete(ctx, dst.String(), true, false)
+				if err != nil {
+					return errdefs.System(fmt.Errorf("failed to delete existing image: %w", err))
+				}
+				_, err = i.images.Create(ctx, newImg)
+			}
+			if err != nil {
+				return errdefs.System(fmt.Errorf("failed to create image: %w", err))
+			}
+		}
 	}
 	return nil
 }
@@ -89,26 +94,28 @@ func (i *ImageService) convertManifests(ctx context.Context, srcImg images.Image
 	}
 
 	err := walker(ctx, srcImg, func(m *ImageManifest) error {
-		if opts.NoAttestations && m.IsAttestation() {
-			return nil
+		if m.IsAttestation() {
+			if opts.NoAttestations {
+				return nil
+			}
+		} else {
+			mtarget := m.Target()
+			mplatform, err := m.ImagePlatform(ctx)
+			if err != nil {
+				return err
+			}
+			if !pm.Match(mplatform) {
+				changed = true
+				log.G(ctx).WithFields(log.Fields{
+					"platform": mplatform,
+					"digest":   mtarget.Digest,
+				}).Debugf("skipping manifest %s due to platform mismatch", mtarget.Digest)
+				return images.ErrSkipDesc
+			}
+
+			newManifests = append(newManifests, mtarget)
 		}
 
-		mtarget := m.Target()
-		mplatform, err := m.ImagePlatform(ctx)
-		if err != nil {
-			return err
-		}
-		if !pm.Match(mplatform) {
-			changed = true
-			log.G(ctx).WithFields(log.Fields{
-				"platform": mplatform,
-				"digest":   mtarget.Digest,
-			}).Debugf("skipping manifest %s due to platform mismatch", mtarget.Digest)
-			return images.ErrSkipDesc
-		}
-
-		newManifests = append(newManifests, mtarget)
-
 		return nil
 	})
 	if err != nil {

diff --git a/daemon/containerd/image_convert_test.go b/daemon/containerd/image_convert_test.go
@@ -84,7 +84,7 @@ func TestImageConvert(t *testing.T) {
 			assert.NilError(t, err)
 
 			dst := dstRef(tc.name)
-			err = service.ImageConvert(ctx, srcImg.Name, dst, tc.opts)
+			err = service.ImageConvert(ctx, srcImg.Name, []reference.NamedTagged{dst}, tc.opts)
 
 			if tc.err != nil {
 				assert.ErrorIs(t, err, tc.err)

diff --git a/daemon/image_service.go b/daemon/image_service.go
@@ -44,7 +44,7 @@ type ImageService interface {
 	ImageHistory(ctx context.Context, name string) ([]*imagetype.HistoryResponseItem, error)
 	CommitImage(ctx context.Context, c backend.CommitConfig) (image.ID, error)
 	SquashImage(id, parent string) (string, error)
-	ImageConvert(ctx context.Context, src string, dst reference.NamedTagged, options imagetype.ConvertOptions) error
+	ImageConvert(ctx context.Context, src string, dsts []reference.NamedTagged, options imagetype.ConvertOptions) error
 
 	// Containerd related methods
 

diff --git a/daemon/images/image_convert.go b/daemon/images/image_convert.go
@@ -10,6 +10,6 @@ import (
 	"github.com/docker/docker/errdefs"
 )
 
-func (i *ImageService) ImageConvert(ctx context.Context, src string, dst reference.NamedTagged, opts imagetypes.ConvertOptions) error {
+func (i *ImageService) ImageConvert(ctx context.Context, src string, dsts []reference.NamedTagged, opts imagetypes.ConvertOptions) error {
 	return errdefs.NotImplemented(errors.New("not supported in graphdriver backed image store"))
 }