github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Update ctr to make local the default for distribution

Browse Source 
Disable using transfer service by default for now

Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan 2022-09-28 22:23:52 -07:00
parent ef61e13a6e
commit 42eedc0bc7
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/ctr/commands/images/import.go
View File

@ -84,7 +84,7 @@ If foobar.tar contains an OCI ref named "latest" and anonymous ref "sha256:deadb
Name: "no-unpack", Name: "no-unpack",
Usage: "skip unpacking the images, cannot be used with --discard-unpacked-layers, false by default", Usage: "skip unpacking the images, cannot be used with --discard-unpacked-layers, false by default",
}, },
cli.BoolFlag{ cli.BoolTFlag{
Name: "local", Name: "local",
Usage: "run import locally rather than through transfer API", Usage: "run import locally rather than through transfer API",
}, },
@ -111,7 +111,7 @@ If foobar.tar contains an OCI ref named "latest" and anonymous ref "sha256:deadb
} }
defer cancel() defer cancel()
if !context.Bool("local") { if !context.BoolT("local") {
var opts []image.StoreOpt var opts []image.StoreOpt
prefix := context.String("base-name") prefix := context.String("base-name")
if prefix == "" { if prefix == "" {

4
cmd/ctr/commands/images/pull.go
View File

@ -73,7 +73,7 @@ command. As part of this process, we do the following:
Name: "max-concurrent-downloads", Name: "max-concurrent-downloads",
Usage: "Set the max concurrent downloads for each pull", Usage: "Set the max concurrent downloads for each pull",
}, },
cli.BoolFlag{ cli.BoolTFlag{
Name: "local", Name: "local",
Usage: "Fetch content from local client rather than using transfer service", Usage: "Fetch content from local client rather than using transfer service",
}, },
@ -92,7 +92,7 @@ command. As part of this process, we do the following:
} }
defer cancel() defer cancel()
if !context.Bool("local") { if !context.BoolT("local") {
ch, err := commands.NewStaticCredentials(ctx, context, ref) ch, err := commands.NewStaticCredentials(ctx, context, ref)
if err != nil { if err != nil {
return err return err

6
cmd/ctr/commands/images/push.go
View File

@ -70,9 +70,9 @@ var pushCommand = cli.Command{
}, cli.IntFlag{ }, cli.IntFlag{
Name: "max-concurrent-uploaded-layers", Name: "max-concurrent-uploaded-layers",
Usage: "set the max concurrent uploaded layers for each push", Usage: "set the max concurrent uploaded layers for each push",
}, cli.BoolFlag{ }, cli.BoolTFlag{
Name: "local", Name: "local",
Usage: "Push content from local client rather than using transfer service", Usage: "push content from local client rather than using transfer service",
}, cli.BoolFlag{ }, cli.BoolFlag{
Name: "allow-non-distributable-blobs", Name: "allow-non-distributable-blobs",
Usage: "allow pushing blobs that are marked as non-distributable", Usage: "allow pushing blobs that are marked as non-distributable",
@ -94,7 +94,7 @@ var pushCommand = cli.Command{
} }
defer cancel() defer cancel()
if !context.Bool("local") { if !context.BoolT("local") {
ch, err := commands.NewStaticCredentials(ctx, context, ref) ch, err := commands.NewStaticCredentials(ctx, context, ref)
if err != nil { if err != nil {
return err return err