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

Merge pull request #91 from rakyll/ctr

Browse source 
ctr: convert bundle paths to absolute
This commit is contained in:
Michael Crosby 2016-01-27 14:12:40 -08:00
commit 811f48cb07
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ctr/container.go
View file

@ -96,6 +96,10 @@ var startCommand = cli.Command{
if id == "" { if id == "" {
fatal("container id cannot be empty", 1) fatal("container id cannot be empty", 1)
} }
bpath, err := filepath.Abs(path)
if err != nil {
fatal(fmt.Sprintf("cannot get the absolute path of the bundle: %v", err), 1)
}
c := getClient(context) c := getClient(context)
events, err := c.Events(netcontext.Background(), &types.EventsRequest{}) events, err := c.Events(netcontext.Background(), &types.EventsRequest{})
if err != nil { if err != nil {
@ -103,11 +107,11 @@ var startCommand = cli.Command{
} }
r := &types.CreateContainerRequest{ r := &types.CreateContainerRequest{
Id: id, Id: id,
BundlePath: path, BundlePath: bpath,
Checkpoint: context.String("checkpoint"), Checkpoint: context.String("checkpoint"),
} }
if context.Bool("attach") { if context.Bool("attach") {
mkterm, err := readTermSetting(path) mkterm, err := readTermSetting(bpath)
if err != nil { if err != nil {
fatal(err.Error(), 1) fatal(err.Error(), 1)
} }