Change json to match docker inspect

Changing these fields caused the output of podman inspect to more
closely match docker inspect.

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

Closes: #306
Approved by: mheon

cmd/podman/create.go

@@ -520,12 +520,12 @@ func parseCreateOpts(c *cli.Context, runtime *libpod.Runtime, imageName string,
 	// USER
 	user := c.String("user")
 	if user == "" {
-		user = data.Config.User
+		user = data.ContainerConfig.User
 	}
 
 	// STOP SIGNAL
 	stopSignal := syscall.SIGTERM
-	signalString := data.Config.StopSignal
+	signalString := data.ContainerConfig.StopSignal
 	if c.IsSet("stop-signal") {
 		signalString = c.String("stop-signal")
 	}
@@ -538,7 +538,7 @@ func parseCreateOpts(c *cli.Context, runtime *libpod.Runtime, imageName string,
 
 	// ENVIRONMENT VARIABLES
 	env := defaultEnvVariables
-	for _, e := range data.Config.Env {
+	for _, e := range data.ContainerConfig.Env {
 		split := strings.SplitN(e, "=", 2)
 		if len(split) > 1 {
 			env[split[0]] = split[1]
@@ -555,7 +555,7 @@ func parseCreateOpts(c *cli.Context, runtime *libpod.Runtime, imageName string,
 	if err != nil {
 		return nil, errors.Wrapf(err, "unable to process labels")
 	}
-	for key, val := range data.Config.Labels {
+	for key, val := range data.ContainerConfig.Labels {
 		if _, ok := labels[key]; !ok {
 			labels[key] = val
 		}
@@ -564,14 +564,14 @@ func parseCreateOpts(c *cli.Context, runtime *libpod.Runtime, imageName string,
 	// WORKING DIRECTORY
 	workDir := c.String("workdir")
 	if workDir == "" {
-		workDir = data.Config.WorkingDir
+		workDir = data.ContainerConfig.WorkingDir
 	}
 
 	// ENTRYPOINT
 	// User input entrypoint takes priority over image entrypoint
 	entrypoint := c.StringSlice("entrypoint")
 	if len(entrypoint) == 0 {
-		entrypoint = data.Config.Entrypoint
+		entrypoint = data.ContainerConfig.Entrypoint
 	}
 
 	// Build the command
@@ -582,13 +582,13 @@ func parseCreateOpts(c *cli.Context, runtime *libpod.Runtime, imageName string,
 	if len(inputCommand) > 0 {
 		// User command overrides data CMD
 		command = append(command, inputCommand...)
-	} else if len(data.Config.Cmd) > 0 && !c.IsSet("entrypoint") {
+	} else if len(data.ContainerConfig.Cmd) > 0 && !c.IsSet("entrypoint") {
 		// If not user command, add CMD
-		command = append(command, data.Config.Cmd...)
+		command = append(command, data.ContainerConfig.Cmd...)
 	}
 
 	// EXPOSED PORTS
-	portBindings, err := exposedPorts(c, data.Config.ExposedPorts)
+	portBindings, err := exposedPorts(c, data.ContainerConfig.ExposedPorts)
 	if err != nil {
 		return nil, err
 	}

cmd/podman/inspect.go

@@ -78,6 +78,10 @@ func inspectCmd(c *cli.Context) error {
 		inspectType = inspectTypeContainer
 	}
 	outputFormat := c.String("format")
+	if strings.Contains(outputFormat, "{{.Id}}") {
+		outputFormat = strings.Replace(outputFormat, "{{.Id}}", formats.IDString, -1)
+	}
+
 	var data interface{}
 	switch inspectType {
 	case inspectTypeContainer:

cmd/podman/run_test.go

@@ -44,7 +44,7 @@ func generateAlpineImageData() *inspect.ImageData {
 		Architecture:    "amd64",
 		Os:              "linux",
 		Version:         "17.06.2-ce",
-		Config:       config,
+		ContainerConfig: config,
 	}
 	return data
 }

docs/podman-inspect.1.md

@@ -46,7 +46,7 @@ Display the total file size if the type is a container
     "Parent": "",
     "Comment": "",
     "Created": "2017-11-14T21:07:08.475840838Z",
-    "Config": {
+    "ContainerConfig": {
         "Env": [
             "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
             "DISTTAG=f27container",

libpod/image_inspect.go

@@ -50,7 +50,7 @@ func getImageData(img storage.Image, imgRef types.Image, size int64, driver *ins
 		Author:          ociv1Img.Author,
 		Architecture:    ociv1Img.Architecture,
 		Os:              ociv1Img.OS,
-		Config:       &ociv1Img.Config,
+		ContainerConfig: &ociv1Img.Config,
 		Version:         info.DockerVersion,
 		Size:            size,
 		VirtualSize:     size + imgSize,

pkg/inspect/inspect.go

@@ -106,14 +106,14 @@ type LogConfig struct {
 
 // ImageData holds the inspect information of an image
 type ImageData struct {
-	ID           string            `json:"ID"`
+	ID              string            `json:"Id"`
 	Digest          digest.Digest     `json:"Digest"`
 	RepoTags        []string          `json:"RepoTags"`
 	RepoDigests     []string          `json:"RepoDigests"`
 	Parent          string            `json:"Parent"`
 	Comment         string            `json:"Comment"`
 	Created         *time.Time        `json:"Created"`
-	Config       *v1.ImageConfig   `json:"Config"`
+	ContainerConfig *v1.ImageConfig   `json:"ContainerConfig"`
 	Version         string            `json:"Version"`
 	Author          string            `json:"Author"`
 	Architecture    string            `json:"Architecture"`

test/e2e/import_test.go

@@ -101,7 +101,7 @@ var _ = Describe("Podman import", func() {
 		results.WaitWithDefaultTimeout()
 		Expect(results.ExitCode()).To(Equal(0))
 		imageData := results.InspectImageJSON()
-		Expect(imageData.Config.Cmd[0]).To(Equal("/bin/bash"))
+		Expect(imageData.ContainerConfig.Cmd[0]).To(Equal("/bin/bash"))
 	})
 
 })