[release-v0.55] manifests,push: add support for AddCompression

go.mod

@@ -8,7 +8,7 @@ require (
  github.com/containerd/containerd v1.7.2
  github.com/containernetworking/cni v1.1.2
  github.com/containernetworking/plugins v1.3.0
- github.com/containers/image/v5 v5.26.1
+ github.com/containers/image/v5 v5.27.0
  github.com/containers/ocicrypt v1.1.7
  github.com/containers/storage v1.48.0
  github.com/coreos/go-systemd/v22 v22.5.0

go.sum

@@ -49,8 +49,8 @@ github.com/containernetworking/cni v1.1.2 h1:wtRGZVv7olUHMOqouPpn3cXJWpJgM6+EUl3
 github.com/containernetworking/cni v1.1.2/go.mod h1:sDpYKmGVENF3s6uvMvGgldDWeG8dMxakj/u+i9ht9vw=
 github.com/containernetworking/plugins v1.3.0 h1:QVNXMT6XloyMUoO2wUOqWTC1hWFV62Q6mVDp5H1HnjM=
 github.com/containernetworking/plugins v1.3.0/go.mod h1:Pc2wcedTQQCVuROOOaLBPPxrEXqqXBFt3cZ+/yVg6l0=
-github.com/containers/image/v5 v5.26.1 h1:8y3xq8GO/6y8FR+nAedHPsAFiAtOrab9qHTBpbqaX8g=
-github.com/containers/image/v5 v5.26.1/go.mod h1:IwlOGzTkGnmfirXxt0hZeJlzv1zVukE03WZQ203Z9GA=
+github.com/containers/image/v5 v5.27.0 h1:4jKVWAa4YurTWUyAWMoC71zJkSylBR7pWd0jqGkukYc=
+github.com/containers/image/v5 v5.27.0/go.mod h1:IwlOGzTkGnmfirXxt0hZeJlzv1zVukE03WZQ203Z9GA=
 github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA=
 github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY=
 github.com/containers/ocicrypt v1.1.7 h1:thhNr4fu2ltyGz8aMx8u48Ae0Pnbip3ePP9/mzkZ/3U=

libimage/manifest_list.go

@@ -415,6 +415,8 @@ type ManifestListPushOptions struct {
  ImageListSelection imageCopy.ImageListSelection
  // Use when selecting only specific imags.
  Instances []digest.Digest
+ // Add existing instances with requested compression algorithms to manifest list
+ AddCompression []string
 }
 
 // Push pushes a manifest to the specified destination.
@@ -446,6 +448,7 @@ func (m *ManifestList) Push(ctx context.Context, destination string, options *Ma
  defer copier.close()
 
  pushOptions := manifests.PushOptions{
+ AddCompression: options.AddCompression,
  Store: m.image.runtime.store,
  SystemContext: copier.systemContext,
  ImageListSelection: options.ImageListSelection,

libimage/manifests/manifests.go

@@ -14,6 +14,7 @@ import (
  "github.com/containers/image/v5/docker/reference"
  "github.com/containers/image/v5/image"
  "github.com/containers/image/v5/manifest"
+ "github.com/containers/image/v5/pkg/compression"
  "github.com/containers/image/v5/signature"
  "github.com/containers/image/v5/signature/signer"
  is "github.com/containers/image/v5/storage"
@@ -70,6 +71,7 @@ type PushOptions struct {
  RemoveSignatures bool // true to discard signatures in images
  ManifestType string // the format to use when saving the list - possible options are oci, v2s1, and v2s2
  SourceFilter LookupReferenceFunc // filter the list source
+ AddCompression []string // add existing instances with requested compression algorithms to manifest list
 }
 
 // Create creates a new list containing information about the specified image,
@@ -239,6 +241,10 @@ func (l *list) Push(ctx context.Context, dest types.ImageReference, options Push
  return nil, "", err
  }
  }
+ compressionVariants, err := prepareAddWithCompression(options.AddCompression)
+ if err != nil {
+ return nil, "", err
+ }
  copyOptions := &cp.Options{
  ImageListSelection: options.ImageListSelection,
  Instances: options.Instances,
@@ -252,6 +258,7 @@ func (l *list) Push(ctx context.Context, dest types.ImageReference, options Push
  SignBySigstorePrivateKeyFile: options.SignBySigstorePrivateKeyFile,
  SignSigstorePrivateKeyPassphrase: options.SignSigstorePrivateKeyPassphrase,
  ForceManifestMIMEType: singleImageManifestType,
+ EnsureCompressionVariantsExist: compressionVariants,
  }
 
  // Copy whatever we were asked to copy.
@@ -266,6 +273,18 @@ func (l *list) Push(ctx context.Context, dest types.ImageReference, options Push
  return nil, manifestDigest, nil
 }
 
+func prepareAddWithCompression(variants []string) ([]cp.OptionCompressionVariant, error) {
+ res := []cp.OptionCompressionVariant{}
+ for _, name := range variants {
+ algo, err := compression.AlgorithmByName(name)
+ if err != nil {
+ return nil, fmt.Errorf("requested algorithm %s is not supported for replication: %w", name, err)
+ }
+ res = append(res, cp.OptionCompressionVariant{Algorithm: algo})
+ }
+ return res, nil
+}
+
 // Add adds information about the specified image to the list, computing the
 // image's manifest's digest, retrieving OS and architecture information from
 // the image's configuration, and recording the image's reference so that it

libimage/manifests/manifests_test.go

@@ -333,4 +333,8 @@ func TestPush(t *testing.T) {
  options.Instances = append(options.Instances, otherListDigest)
  _, _, err = list.Push(ctx, destRef, options)
  assert.Nilf(t, err, "list.Push(four specified)")
+
+ options.AddCompression = []string{"zstd"}
+ _, _, err = list.Push(ctx, destRef, options)
+ assert.NoError(t, err, "list.Push(with replication for zstd specified)")
 }