WIP TarCompression

cmd/podman/common/completion.go

@@ -1780,6 +1780,12 @@ func AutocompleteCompressionFormat(cmd *cobra.Command, args []string, toComplete
 	return types, cobra.ShellCompDirectiveNoFileComp
 }
 
+// AutocompleteTarCompressionFormat - Autocomplete tar-compression-format type options.
+func AutocompleteTarCompressionFormat(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+	types := []string{"gzip", "zstd"}
+	return types, cobra.ShellCompDirectiveNoFileComp
+}
+
 // AutocompleteClone - Autocomplete container and image names
 func AutocompleteClone(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	if !validCurrentCmdLine(cmd, args, toComplete) {

cmd/podman/common/tarcompress.go

@@ -0,0 +1,36 @@
+package common
+
+import (
+	"github.com/containers/common/pkg/completion"
+	"github.com/containers/podman/v5/cmd/podman/registry"
+	"github.com/spf13/cobra"
+)
+
+func DefineTarCompressFlags(cmd *cobra.Command, tarCompFormat *string) {
+	flags := cmd.Flags()
+
+	tarCompFormatStr := "tar-compression-format"
+	flags.StringVar(tarCompFormat, tarCompFormatStr, tarCompressionFormat(), "compression format to use for archives")
+	_ = cmd.RegisterFlagCompletionFunc(tarCompFormatStr, AutocompleteTarCompressionFormat)
+
+	tarCompLevel := "tar-compression-level"
+	flags.Int(tarCompLevel, tarCompressionLevel(), "compression level to use for archives")
+	_ = cmd.RegisterFlagCompletionFunc(tarCompLevel, completion.AutocompleteNone)
+
+}
+
+func tarCompressionFormat() string {
+	if registry.IsRemote() {
+		return ""
+	}
+
+	return podmanConfig.ContainersConfDefaultsRO.Engine.TarCompressionFormat
+}
+
+func tarCompressionLevel() int {
+	if registry.IsRemote() || podmanConfig.ContainersConfDefaultsRO.Engine.TarCompressionLevel == nil {
+		return 0
+	}
+
+	return *podmanConfig.ContainersConfDefaultsRO.Engine.TarCompressionLevel
+}

cmd/podman/images/push.go

@@ -80,6 +80,8 @@ func init() {
 func pushFlags(cmd *cobra.Command) {
 	flags := cmd.Flags()
 
+	common.DefineTarCompressFlags(cmd, &pushOptions.TarCompressionFormat)
+
 	// For now default All flag to true, for pushing of manifest lists
 	pushOptions.All = true
 	authfileFlagName := "authfile"
@@ -249,6 +251,14 @@ func imagePush(cmd *cobra.Command, args []string) error {
 		}
 	}
 
+	if cmd.Flags().Changed("tar-compression-level") {
+		val, err := cmd.Flags().GetInt("tar-compression-level")
+		if err != nil {
+			return err
+		}
+		pushOptions.TarCompressionLevel = &val
+	}
+
 	// Let's do all the remaining Yoga in the API to prevent us from scattering
 	// logic across (too) many parts of the code.
 	report, err := registry.ImageEngine().Push(registry.GetContext(), source, destination, pushOptions.ImagePushOptions)

cmd/podman/images/save.go

@@ -82,6 +82,8 @@ func init() {
 func saveFlags(cmd *cobra.Command) {
 	flags := cmd.Flags()
 
+	common.DefineTarCompressFlags(cmd, &saveOpts.TarCompressionFormat)
+
 	flags.BoolVar(&saveOpts.Compress, "compress", false, "Compress tarball image layers when saving to a directory using the 'dir' transport. (default is same compression type as source)")
 
 	flags.BoolVar(&saveOpts.OciAcceptUncompressedLayers, "uncompressed", false, "Accept uncompressed layers when copying OCI images")
@@ -111,6 +113,13 @@ func save(cmd *cobra.Command, args []string) (finalErr error) {
 	if cmd.Flag("compress").Changed && saveOpts.Format != define.V2s2ManifestDir {
 		return errors.New("--compress can only be set when --format is 'docker-dir'")
 	}
+	if cmd.Flags().Changed("tar-compression-level") {
+		val, err := cmd.Flags().GetInt("tar-compression-level")
+		if err != nil {
+			return err
+		}
+		saveOpts.TarCompressionLevel = &val
+	}
 	if len(saveOpts.Output) == 0 {
 		saveOpts.Quiet = true
 		fi := os.Stdout

cmd/podman/images/scp.go

@@ -7,6 +7,7 @@ import (
 	"github.com/containers/common/pkg/ssh"
 	"github.com/containers/podman/v5/cmd/podman/common"
 	"github.com/containers/podman/v5/cmd/podman/registry"
+	"github.com/containers/podman/v5/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
 
@@ -73,7 +74,14 @@ func scp(cmd *cobra.Command, args []string) (finalErr error) {
 	}
 
 	sshEngine := ssh.DefineMode(sshType)
-	err = registry.ImageEngine().Scp(registry.Context(), src, dst, parentFlags, quiet, sshEngine)
+	err = registry.ImageEngine().Scp(registry.Context(), src, dst, entities.ImageScpBaseOptions{
+		ImageExecuteTransferOptions: entities.ImageExecuteTransferOptions{
+			ParentFlags:          parentFlags,
+			Quiet:                quiet,
+			SshMode:              sshEngine,
+			TarCompressionFormat: "gzip",
+		},
+	})
 	if err != nil {
 		return err
 	}

pkg/bindings/images/types.go

@@ -83,6 +83,8 @@ type ExportOptions struct {
 	Format *string
 	// Accept uncompressed layers when copying OCI images.
 	OciAcceptUncompressedLayers *bool
+	TarCompressionFormat        *string
+	TarCompressionLevel         *int
 }
 
 // PruneOptions are optional options for pruning images
@@ -151,7 +153,9 @@ type PushOptions struct {
 	// algorithms are not reused.
 	ForceCompressionFormat *bool
 	// Add existing instances with requested compression algorithms to manifest list
-	AddCompression []string
+	AddCompression       []string
+	TarCompressionFormat *string
+	TarCompressionLevel  *int
 	// Manifest type of the pushed image
 	Format *string
 	// Password for authenticating against the registry.
@@ -245,6 +249,8 @@ type ExistsOptions struct {
 }
 
 type ScpOptions struct {
-	Quiet       *bool
-	Destination *string
+	TarCompressionFormat *string
+	TarCompressionLevel  *int
+	Quiet                *bool
+	Destination          *string
 }

pkg/domain/entities/engine_image.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/containers/common/libimage/define"
 	"github.com/containers/common/pkg/config"
-	"github.com/containers/common/pkg/ssh"
 	"github.com/containers/podman/v5/pkg/domain/entities/reports"
 )
 
@@ -24,7 +23,7 @@ type ImageEngine interface { //nolint:interfacebloat
 	Push(ctx context.Context, source string, destination string, opts ImagePushOptions) (*ImagePushReport, error)
 	Remove(ctx context.Context, images []string, opts ImageRemoveOptions) (*ImageRemoveReport, []error)
 	Save(ctx context.Context, nameOrID string, tags []string, options ImageSaveOptions) error
-	Scp(ctx context.Context, src, dst string, parentFlags []string, quiet bool, sshMode ssh.EngineMode) error
+	Scp(ctx context.Context, src, dst string, opts ImageScpBaseOptions) error
 	Search(ctx context.Context, term string, opts ImageSearchOptions) ([]ImageSearchReport, error)
 	SetTrust(ctx context.Context, args []string, options SetTrustOptions) error
 	ShowTrust(ctx context.Context, args []string, options ShowTrustOptions) (*ShowTrustReport, error)

pkg/domain/entities/images.go

@@ -5,6 +5,7 @@ import (
 	"net/url"
 
 	"github.com/containers/common/pkg/config"
+	"github.com/containers/common/pkg/ssh"
 	"github.com/containers/image/v5/manifest"
 	"github.com/containers/image/v5/signature/signer"
 	"github.com/containers/image/v5/types"
@@ -199,6 +200,8 @@ type ImagePushOptions struct {
 	// CompressionFormat is used exclusively, and blobs of other compression
 	// algorithms are not reused.
 	ForceCompressionFormat bool
+	TarCompressionFormat   string
+	TarCompressionLevel    *int
 }
 
 // ImagePushReport is the response from pushing an image.
@@ -301,8 +304,10 @@ type ImageSaveOptions struct {
 	// Output - write image to the specified path.
 	Output string
 	// Quiet - suppress output when copying images
-	Quiet           bool
-	SignaturePolicy string
+	Quiet                bool
+	SignaturePolicy      string
+	TarCompressionFormat string
+	TarCompressionLevel  *int
 }
 
 // ImageScpOptions provide options for securely copying images to and from a remote host
@@ -331,6 +336,25 @@ type ImageScpConnections struct {
 	Identities []string
 }
 
+type ImageScpBaseOptions struct {
+	ImageExecuteTransferOptions
+}
+
+type ImageExecuteTransferOptions struct {
+	ParentFlags          []string
+	Quiet                bool
+	SshMode              ssh.EngineMode
+	TarCompressionFormat string
+	TarCompressionLevel  *int
+}
+
+type ImageExecuteTransferReport struct {
+	LoadReport  *ImageLoadReport
+	Source      *ImageScpOptions
+	Dest        *ImageScpOptions
+	ParentFlags []string
+}
+
 // ImageTreeOptions provides options for ImageEngine.Tree()
 type ImageTreeOptions struct {
 	WhatRequires bool // Show all child images and layers of the specified image