14fe2d5f20
Add a '\n' after "unpacking xxx..." to avoid mix of logs such as: ``` unpacking sha256:a7776895af32e34b1fef997e26c79fa988b40c5cf2a3fb48dc22e0584b648d82...DEBU[0005] Extraction not needed, layer snapshot exists DEBU[0005] Extraction not needed, layer snapshot exists DEBU[0005] Extraction not needed, layer snapshot exists DEBU[0005] Extraction not needed, layer snapshot exists DEBU[0005] Extraction not needed, layer snapshot exists DEBU[0005] Extraction not needed, layer snapshot exists done ``` After this commit: ``` unpacking sha256:a7776895af32e34b1fef997e26c79fa988b40c5cf2a3fb48dc22e0584b648d82... DEBU[0008] Extraction not needed, layer snapshot exists DEBU[0008] Extraction not needed, layer snapshot exists DEBU[0008] Extraction not needed, layer snapshot exists DEBU[0008] Extraction not needed, layer snapshot exists DEBU[0008] Extraction not needed, layer snapshot exists DEBU[0008] Extraction not needed, layer snapshot exists done ``` Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
46 lines
1.1 KiB
Go
46 lines
1.1 KiB
Go
package main
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/containerd/containerd/log"
|
|
"github.com/urfave/cli"
|
|
)
|
|
|
|
var pullCommand = cli.Command{
|
|
Name: "pull",
|
|
Usage: "pull an image from a remote",
|
|
ArgsUsage: "[flags] <ref>",
|
|
Description: `Fetch and prepare an image for use in containerd.
|
|
|
|
After pulling an image, it should be ready to use the same reference in a run
|
|
command. As part of this process, we do the following:
|
|
|
|
1. Fetch all resources into containerd.
|
|
2. Prepare the snapshot filesystem with the pulled resources.
|
|
3. Register metadata for the image.
|
|
`,
|
|
Flags: append(registryFlags, snapshotterFlags...),
|
|
Action: func(clicontext *cli.Context) error {
|
|
var (
|
|
ref = clicontext.Args().First()
|
|
)
|
|
|
|
ctx, cancel := appContext(clicontext)
|
|
defer cancel()
|
|
|
|
img, err := fetch(ctx, ref, clicontext)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
log.G(ctx).WithField("image", ref).Debug("unpacking")
|
|
|
|
// TODO: Show unpack status
|
|
fmt.Printf("unpacking %s...\n", img.Target().Digest)
|
|
err = img.Unpack(ctx, clicontext.String("snapshotter"))
|
|
fmt.Println("done")
|
|
return err
|
|
},
|
|
}
|