opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-15 03:02:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add check for successful imageData call

Browse Source 
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Closes: #234
Approved by: baude
This commit is contained in:
Daniel J Walsh
2018-01-17 09:26:50 -05:00
committed by Atomic Bot
parent d4e4878ec3
commit 1735598d12
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/podman/create.go
View File

@ -170,6 +170,9 @@ func createCmd(c *cli.Context) error {
defer runtime.Shutdown(false) defer runtime.Shutdown(false)
imageName, _, data, err := imageData(c, runtime, c.Args()[0]) imageName, _, data, err := imageData(c, runtime, c.Args()[0])
if err != nil {
return err
}
createConfig, err := parseCreateOpts(c, runtime, imageName, data) createConfig, err := parseCreateOpts(c, runtime, imageName, data)
if err != nil { if err != nil {
return err 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 // Parses CLI options related to container creation into a config which can be
// parsed into an OCI runtime spec // parsed into an OCI runtime spec
func parseCreateOpts(c *cli.Context, runtime *libpod.Runtime, imageName string, data *libpod.ImageData) (*createConfig, error) { 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 command []string
var memoryLimit, memoryReservation, memorySwap, memoryKernel int64 var memoryLimit, memoryReservation, memorySwap, memoryKernel int64
var blkioWeight uint16 var blkioWeight uint16

4
cmd/podman/run.go
View File

@ -46,6 +46,10 @@ func runCmd(c *cli.Context) error {
} }
imageName, _, data, err := imageData(c, runtime, c.Args()[0]) imageName, _, data, err := imageData(c, runtime, c.Args()[0])
if err != nil {
return err
}
createConfig, err := parseCreateOpts(c, runtime, imageName, data) createConfig, err := parseCreateOpts(c, runtime, imageName, data)
if err != nil { if err != nil {
return err return err