Merge pull request #795 from rhatdan/kpod-push-compression
Disable compression by default.
This commit is contained in:
commit
3e7cbc9fe7
2 changed files with 2 additions and 11 deletions
|
@ -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,10 +71,6 @@ 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")
|
||||||
|
@ -113,7 +104,7 @@ func pushCmd(c *cli.Context) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
options := libkpodimage.CopyOptions{
|
options := libkpodimage.CopyOptions{
|
||||||
Compression: compress,
|
Compression: archive.Uncompressed,
|
||||||
SignaturePolicyPath: signaturePolicy,
|
SignaturePolicyPath: signaturePolicy,
|
||||||
Store: store,
|
Store: store,
|
||||||
DockerRegistryOptions: common.DockerRegistryOptions{
|
DockerRegistryOptions: common.DockerRegistryOptions{
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue