opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 18:59:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Podman push --help should reveal default compression

Browse Source 
When using the local client, we should display the compression
algorithm.

If the compression level is set, then show this also.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2023-11-02 18:16:45 -04:00
parent b44d372b1b
commit 420316ef6e
2 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cmd/podman/images/push.go
View File

@ -129,13 +129,13 @@ func pushFlags(cmd *cobra.Command) {
flags.BoolVar(&pushOptions.TLSVerifyCLI, "tls-verify", true, "Require HTTPS and verify certificates when contacting registries")
compressionFormat := "compression-format"
flags.StringVar(&pushOptions.CompressionFormat, compressionFormat, "", "compression format to use")
_ = cmd.RegisterFlagCompletionFunc(compressionFormat, common.AutocompleteCompressionFormat)
compFormat := "compression-format"
flags.StringVar(&pushOptions.CompressionFormat, compFormat, compressionFormat(), "compression format to use")
_ = cmd.RegisterFlagCompletionFunc(compFormat, common.AutocompleteCompressionFormat)
compressionLevel := "compression-level"
flags.Int(compressionLevel, 0, "compression level to use")
_ = cmd.RegisterFlagCompletionFunc(compressionLevel, completion.AutocompleteNone)
compLevel := "compression-level"
flags.Int(compLevel, compressionLevel(), "compression level to use")
_ = cmd.RegisterFlagCompletionFunc(compLevel, completion.AutocompleteNone)
encryptionKeysFlagName := "encryption-key"
flags.StringSliceVar(&pushOptions.EncryptionKeys, encryptionKeysFlagName, nil, "Key with the encryption protocol to use to encrypt the image (e.g. jwe:/path/to/key.pem)")
@ -239,3 +239,19 @@ func imagePush(cmd *cobra.Command, args []string) error {
return nil
}
func compressionFormat() string {
if registry.IsRemote() {
return ""
}
return containerConfig.ContainersConfDefaultsRO.Engine.CompressionFormat
}
func compressionLevel() int {
if registry.IsRemote() || containerConfig.ContainersConfDefaultsRO.Engine.CompressionLevel == nil {
return 0
}
return *containerConfig.ContainersConfDefaultsRO.Engine.CompressionLevel
}

18
test/system/800-config.bats
View File

@ -249,4 +249,22 @@ EOF
run_podman rm -f -t0 $cname
}
@test "podman push CONTAINERS_CONF" {
skip_if_remote "containers.conf does not effect client side of --remote"
CONTAINERS_CONF=/dev/null run_podman push --help
assert "$output" =~ "--compression-format string.*compression format to use \(default \"gzip\"\)" "containers.conf should set default to gzip"
assert "$output" !~ "compression level to use \(default" "containers.conf should not set default compressionlevel"
conf_tmp="$PODMAN_TMPDIR/containers.conf"
cat >$conf_tmp <<EOF
[engine]
compression_format="zstd:chunked"
compression_level=1
EOF
CONTAINERS_CONF="$conf_tmp" run_podman push --help
assert "$output" =~ "--compression-format string.*compression format to use \(default \"zstd:chunked\"\)" "containers.conf should set default to zstd:chunked"
assert "$output" =~ "--compression-level int.*compression level to use \(default 1\)" "containers.conf should set default compressionlevel to 1"
}
# vim: filetype=sh