vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Disable compression by default

Browse source 
Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
This commit is contained in:
Ryan Cole 2017-08-07 13:43:50 -04:00 committed by Daniel J Walsh
parent 6473eec86a
commit 865612c3db
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cmd/kpod/push.go
View file

@ -15,11 +15,6 @@ import (
var ( var (
pushFlags = []cli.Flag{ pushFlags = []cli.Flag{
cli.BoolFlag{
Name: "disable-compression, D",
Usage: "don't compress layers",
Hidden: true,
},
cli.StringFlag{ cli.StringFlag{
Name: "signature-policy", Name: "signature-policy",
Usage: "`pathname` of signature policy file (not usually used)", Usage: "`pathname` of signature policy file (not usually used)",
@ -76,15 +71,13 @@ func pushCmd(c *cli.Context) error {
destName := c.Args().Get(1) destName := c.Args().Get(1)
signaturePolicy := c.String("signature-policy") signaturePolicy := c.String("signature-policy")
compress := archive.Uncompressed
if !c.Bool("disable-compression") {
compress = archive.Gzip
}
registryCredsString := c.String("creds") registryCredsString := c.String("creds")
certPath := c.String("cert-dir") certPath := c.String("cert-dir")
skipVerify := !c.BoolT("tls-verify") skipVerify := !c.BoolT("tls-verify")
removeSignatures := c.Bool("remove-signatures") removeSignatures := c.Bool("remove-signatures")
signBy := c.String("sign-by") signBy := c.String("sign-by")
// Leave this here in case we want to add a compression option in the future
compress := archive.Uncompressed
if registryCredsString != "" { if registryCredsString != "" {
creds, err := common.ParseRegistryCreds(registryCredsString) creds, err := common.ParseRegistryCreds(registryCredsString)

2
test/kpod.bats
View file

@ -169,7 +169,7 @@ function teardown() {
run mkdir /tmp/oci-busybox run mkdir /tmp/oci-busybox
echo "$output" echo "$output"
[ "$status" -eq 0 ] [ "$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" echo "$output"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
run rm -rf /tmp/oci-busybox run rm -rf /tmp/oci-busybox