diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-01-17 09:26:50 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-01-17 14:49:23 +0000 |
| commit | 1735598d12dfc6965c1881d537c6c0051a3637dd (patch) | |
| tree | 2d0db64d05273747902b9a77789e9323bce2f7d1 | |
| parent | d4e4878ec3e539e47da8c05227c8020d541a7df2 (diff) | |
| download | podman-1735598d12dfc6965c1881d537c6c0051a3637dd.tar.gz podman-1735598d12dfc6965c1881d537c6c0051a3637dd.tar.bz2 podman-1735598d12dfc6965c1881d537c6c0051a3637dd.zip | |
Add check for successful imageData call
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #234
Approved by: baude
| -rw-r--r-- | cmd/podman/create.go | 4 | ||||
| -rw-r--r-- | cmd/podman/run.go | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/cmd/podman/create.go b/cmd/podman/create.go index d592d5a8d..7ee364fab 100644 --- a/cmd/podman/create.go +++ b/cmd/podman/create.go @@ -170,6 +170,9 @@ func createCmd(c *cli.Context) error { defer runtime.Shutdown(false) imageName, _, data, err := imageData(c, runtime, c.Args()[0]) + if err != nil { + return err + } createConfig, err := parseCreateOpts(c, runtime, imageName, data) if err != nil { return err @@ -370,7 +373,6 @@ func imageData(c *cli.Context, runtime *libpod.Runtime, image string) (string, s // Parses CLI options related to container creation into a config which can be // parsed into an OCI runtime spec func parseCreateOpts(c *cli.Context, runtime *libpod.Runtime, imageName string, data *libpod.ImageData) (*createConfig, error) { - //imageName, imageID, data, err := imageData(c, runtime, image) var command []string var memoryLimit, memoryReservation, memorySwap, memoryKernel int64 var blkioWeight uint16 diff --git a/cmd/podman/run.go b/cmd/podman/run.go index eecfe87b3..97f60cdbf 100644 --- a/cmd/podman/run.go +++ b/cmd/podman/run.go @@ -46,6 +46,10 @@ func runCmd(c *cli.Context) error { } imageName, _, data, err := imageData(c, runtime, c.Args()[0]) + if err != nil { + return err + } + createConfig, err := parseCreateOpts(c, runtime, imageName, data) if err != nil { return err |