diff options
author | umohnani8 <umohnani@redhat.com> | 2018-04-18 16:48:35 -0400 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-04-19 14:08:47 +0000 |
commit | 27107fdac1d75f97caab47cd13efb1d9900cf350 (patch) | |
tree | f5edafbb52505829b15e19ea6a9e66f4440e862b /cmd/podman/create.go | |
parent | 6a9dbf3305e93e5e1c3bff09402a9b801c935fbd (diff) | |
download | podman-27107fdac1d75f97caab47cd13efb1d9900cf350.tar.gz podman-27107fdac1d75f97caab47cd13efb1d9900cf350.tar.bz2 podman-27107fdac1d75f97caab47cd13efb1d9900cf350.zip |
Vendor in latest containers/image and contaners/storage
Made necessary changes to functions to include contex.Context wherever needed
Signed-off-by: umohnani8 <umohnani@redhat.com>
Closes: #640
Approved by: baude
Diffstat (limited to 'cmd/podman/create.go')
-rw-r--r-- | cmd/podman/create.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmd/podman/create.go b/cmd/podman/create.go index 97490d6c0..930f90483 100644 --- a/cmd/podman/create.go +++ b/cmd/podman/create.go @@ -180,12 +180,13 @@ func createCmd(c *cli.Context) error { defer runtime.Shutdown(false) rtc := runtime.GetConfig() + ctx := getContext() - newImage, err := runtime.ImageRuntime().New(c.Args()[0], rtc.SignaturePolicyPath, "", os.Stderr, nil, image.SigningOptions{}, false, false) + newImage, err := runtime.ImageRuntime().New(ctx, c.Args()[0], rtc.SignaturePolicyPath, "", os.Stderr, nil, image.SigningOptions{}, false, false) if err != nil { return err } - data, err := newImage.Inspect() + data, err := newImage.Inspect(ctx) createConfig, err := parseCreateOpts(c, runtime, newImage.Names()[0], data) if err != nil { return err @@ -209,7 +210,7 @@ func createCmd(c *cli.Context) error { options = append(options, libpod.WithShmDir(createConfig.ShmDir)) options = append(options, libpod.WithShmSize(createConfig.Resources.ShmSize)) options = append(options, libpod.WithGroups(createConfig.GroupAdd)) - ctr, err := runtime.NewContainer(runtimeSpec, options...) + ctr, err := runtime.NewContainer(ctx, runtimeSpec, options...) if err != nil { return err } |