Merge pull request #8409 from mlegenovic/master

Docker compat API fixes
containers · Nov 23, 2020 · 5d55285 · 5d55285
2 parents e772ef0 + 6f7b706
commit 5d55285
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go
@@ -321,8 +321,8 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*types.ContainerJSON,
 	cb := types.ContainerJSONBase{
 		ID:              l.ID(),
 		Created:         l.CreatedTime().Format(time.RFC3339Nano),
-		Path:            "",
-		Args:            nil,
+		Path:            inspect.Path,
+		Args:            inspect.Args,
 		State:           &state,
 		Image:           imageName,
 		ResolvConfPath:  inspect.ResolvConfPath,
@@ -331,7 +331,7 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*types.ContainerJSON,
 		LogPath:         l.LogPath(),
 		Node:            nil,
 		Name:            fmt.Sprintf("/%s", l.Name()),
-		RestartCount:    0,
+		RestartCount:    int(inspect.RestartCount),
 		Driver:          inspect.Driver,
 		Platform:        "linux",
 		MountLabel:      inspect.MountLabel,

diff --git a/pkg/api/handlers/compat/info.go b/pkg/api/handlers/compat/info.go
@@ -17,6 +17,7 @@ import (
 	"github.com/containers/podman/v2/pkg/api/handlers/utils"
 	"github.com/containers/podman/v2/pkg/rootless"
 	docker "github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/google/uuid"
 	"github.com/pkg/errors"
@@ -103,7 +104,7 @@ func GetInfo(w http.ResponseWriter, r *http.Request) {
 		PidsLimit:          sysInfo.PidsLimit,
 		Plugins:            docker.PluginsInfo{},
 		ProductLicense:     "Apache-2.0",
-		RegistryConfig:     nil,
+		RegistryConfig:     new(registry.ServiceConfig),
 		RuncCommit:         docker.Commit{},
 		Runtimes:           getRuntimes(configInfo),
 		SecurityOptions:    getSecOpts(sysInfo),

diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go
@@ -52,7 +52,7 @@ func (i *Image) Id() string { // nolint
 
 type ImageSummary struct {
 	ID          string   `json:"Id"`
-	ParentId    string   `json:",omitempty"` // nolint
+	ParentId    string   // nolint
 	RepoTags    []string `json:",omitempty"`
 	Created     int64
 	Size        int64             `json:",omitempty"`