vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Rename prepare to unpack and init to prepare

Browse source 
Unpack and prepare better map to the actions done by rootfs.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
This commit is contained in:
Derek McGowan 2017-03-14 23:34:32 -07:00
parent 340e56ecd0
commit b1bc82726f
No known key found for this signature in database
GPG key ID: F58C5D0A4405ACDB
8 changed files with 164 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

20
cmd/dist/rootfs.go vendored
View file

@ -29,8 +29,8 @@ var rootfsCommand = cli.Command{
}
var rootfsPrepareCommand = cli.Command{
Name: "prepare",
Usage: "prepare applies layers from a manifest to a snapshot",
Name: "unpack",
Usage: "unpack applies layers from a manifest to a snapshot",
ArgsUsage: "[flags] <digest>",
Flags: []cli.Flag{},
Action: func(clicontext *cli.Context) error {
@ -43,7 +43,7 @@ var rootfsPrepareCommand = cli.Command{
return err
}
log.G(ctx).Infof("preparing manifest %s", dgst.String())
log.G(ctx).Infof("unpacking layers from manifest %s", dgst.String())
conn, err := connectGRPC(clicontext)
if err != nil {
@ -56,8 +56,8 @@ var rootfsPrepareCommand = cli.Command{
return err
}
preparer := rootfsservice.NewPreparerFromClient(rootfsapi.NewRootFSClient(conn))
chainID, err := preparer.Prepare(ctx, m.Layers)
unpacker := rootfsservice.NewUnpackerFromClient(rootfsapi.NewRootFSClient(conn))
chainID, err := unpacker.Unpack(ctx, m.Layers)
if err != nil {
return err
}
@ -69,8 +69,8 @@ var rootfsPrepareCommand = cli.Command{
}
var rootfsInitCommand = cli.Command{
Name: "init",
Usage: "init gets mount commands for digest",
Name: "prepare",
Usage: "prepare gets mount commands for digest",
ArgsUsage: "[flags] <digest> <target>",
Flags: []cli.Flag{},
Action: func(clicontext *cli.Context) error {
@ -88,7 +88,7 @@ var rootfsInitCommand = cli.Command{
}
target := clicontext.Args().Get(1)
log.G(ctx).Infof("initializing mounts %s", dgst.String())
log.G(ctx).Infof("preparing mounts %s", dgst.String())
conn, err := connectGRPC(clicontext)
if err != nil {
@ -97,12 +97,12 @@ var rootfsInitCommand = cli.Command{
rclient := rootfsapi.NewRootFSClient(conn)
ir := &rootfsapi.InitMountsRequest{
ir := &rootfsapi.PrepareRequest{
Name: target,
ChainID: dgst,
}
resp, err := rclient.InitMounts(ctx, ir)
resp, err := rclient.Prepare(ctx, ir)
if err != nil {
return err
}