libimage/copier: wire ForceCompressionFormat for image copy

Implement containers/image#2068 for libimage/copier. Signed-off-by: Aditya R <[email protected]>
flouthoc · Aug 8, 2023 · a1478d1 · a1478d1
1 parent 16ed6ef
commit a1478d1
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/libimage/copier.go b/libimage/copier.go
@@ -49,6 +49,10 @@ type CopyOptions struct {
 	CompressionFormat *compression.Algorithm
 	// CompressionLevel specifies what compression level is used
 	CompressionLevel *int
+	// ForceCompressionFormat ensures that the compression algorithm set in
+	// DestinationCtx.CompressionFormat is used exclusively, and blobs of other
+	// compression algorithms are not reused.
+	ForceCompressionFormat bool
 
 	// containers-auth.json(5) file to use when authenticating against
 	// container registries.
@@ -294,6 +298,7 @@ func (r *Runtime) newCopier(options *CopyOptions) (*copier, error) {
 		c.imageCopyOptions.ProgressInterval = time.Second
 	}
 
+	c.imageCopyOptions.ForceCompressionFormat = options.ForceCompressionFormat
 	c.imageCopyOptions.ForceManifestMIMEType = options.ManifestMIMEType
 	c.imageCopyOptions.SourceCtx = c.systemContext
 	c.imageCopyOptions.DestinationCtx = c.systemContext

diff --git a/libimage/push_test.go b/libimage/push_test.go
@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/containers/common/pkg/config"
+	"github.com/containers/image/v5/pkg/compression"
 	"github.com/stretchr/testify/require"
 )
 
@@ -96,3 +97,32 @@ func TestPushOtherPlatform(t *testing.T) {
 	_, err = runtime.Push(ctx, "docker.io/library/alpine:latest", "docker-archive:"+tmp.Name(), pushOptions)
 	require.NoError(t, err)
 }
+
+func TestPushWithForceCompression(t *testing.T) {
+	runtime, cleanup := testNewRuntime(t)
+	defer cleanup()
+	ctx := context.Background()
+
+	// Prefetch alpine.
+	pullOptions := &PullOptions{}
+	pullOptions.Writer = os.Stdout
+	pullOptions.Architecture = "arm64"
+	pulledImages, err := runtime.Pull(ctx, "docker.io/library/alpine:latest", config.PullPolicyAlways, pullOptions)
+	require.NoError(t, err)
+	require.Len(t, pulledImages, 1)
+
+	data, err := pulledImages[0].Inspect(ctx, nil)
+	require.NoError(t, err)
+	require.Equal(t, "arm64", data.Architecture)
+
+	pushOptions := &PushOptions{}
+	pushOptions.CompressionFormat = &compression.Gzip
+	pushOptions.ForceCompressionFormat = true
+	pushOptions.Writer = os.Stdout
+	tmp, err := os.CreateTemp("", "")
+	require.NoError(t, err)
+	tmp.Close()
+	defer os.Remove(tmp.Name())
+	_, err = runtime.Push(ctx, "docker.io/library/alpine:latest", "docker-archive:"+tmp.Name(), pushOptions)
+	require.NoError(t, err)
+}