summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-11-23 21:17:05 +0100
committerGitHub <noreply@github.com>2020-11-23 21:17:05 +0100
commit5d55285188f15eb7662b25a3fd2915a4a72591ba (patch)
tree80fd0f55f2fd36890a3c21daa05198692062ff23
parente772ef0f92a27f2d013e3526f5a0b13927c0700c (diff)
parent6f7b7060e8c4e8e8d59532eebb0ec12da2faefe9 (diff)
downloadpodman-5d55285188f15eb7662b25a3fd2915a4a72591ba.tar.gz
podman-5d55285188f15eb7662b25a3fd2915a4a72591ba.tar.bz2
podman-5d55285188f15eb7662b25a3fd2915a4a72591ba.zip
Merge pull request #8409 from mlegenovic/master
Docker compat API fixes
-rw-r--r--pkg/api/handlers/compat/containers.go6
-rw-r--r--pkg/api/handlers/compat/info.go3
-rw-r--r--pkg/domain/entities/images.go2
3 files changed, 6 insertions, 5 deletions
diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go
index 0ee96b855..5886455e7 100644
--- 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
index 2bb165522..4b3a390f1 100644
--- 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
index cbd6e9192..ab545d882 100644
--- 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"`