Merge pull request #795 from rhatdan/kpod-push-compression

Disable compression by default.
This commit is contained in:
Daniel J Walsh 2017-08-29 06:54:07 -04:00 committed by GitHub
commit 3e7cbc9fe7
2 changed files with 2 additions and 11 deletions

View file

@ -15,11 +15,6 @@ import (
var (
pushFlags = []cli.Flag{
cli.BoolFlag{
Name: "disable-compression, D",
Usage: "don't compress layers",
Hidden: true,
},
cli.StringFlag{
Name: "signature-policy",
Usage: "`pathname` of signature policy file (not usually used)",
@ -76,10 +71,6 @@ func pushCmd(c *cli.Context) error {
destName := c.Args().Get(1)
signaturePolicy := c.String("signature-policy")
compress := archive.Uncompressed
if !c.Bool("disable-compression") {
compress = archive.Gzip
}
registryCredsString := c.String("creds")
certPath := c.String("cert-dir")
skipVerify := !c.BoolT("tls-verify")
@ -113,7 +104,7 @@ func pushCmd(c *cli.Context) error {
}
options := libkpodimage.CopyOptions{
Compression: compress,
Compression: archive.Uncompressed,
SignaturePolicyPath: signaturePolicy,
Store: store,
DockerRegistryOptions: common.DockerRegistryOptions{

View file

@ -169,7 +169,7 @@ function teardown() {
run mkdir /tmp/oci-busybox
echo "$output"
[ "$status" -eq 0 ]
run ${KPOD_BINARY} $KPOD_OPTIONS push --disable-compression "$IMAGE" oci:/tmp/oci-busybox
run ${KPOD_BINARY} $KPOD_OPTIONS push "$IMAGE" oci:/tmp/oci-busybox
echo "$output"
[ "$status" -eq 0 ]
run rm -rf /tmp/oci-busybox