mirror of
https://github.com/containers/podman.git
synced 2025-06-23 02:18:13 +08:00
[WIP] Docker compat API fixes
These are the first fixes that are needed for development environments like Eclipse or IntelliJ that have Docker plug-ins and use the Docker API to speak with container engine (#7857) Signed-off-by: Milivoje Legenovic <m.legenovic@gmail.com>
This commit is contained in:
@ -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,
|
||||
|
@ -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),
|
||||
|
@ -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"`
|
||||
|
Reference in New Issue
Block a user