diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-07-09 14:04:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-09 14:04:08 -0400 |
| commit | ec97739712336dbb0553c40560b7d84d035cd74b (patch) | |
| tree | d0babe6ec89af6006f4645d1f9e9c61bca97689f /pkg | |
| parent | 43abe006a3d8026b6cc7deace0a29a08a5d4bc08 (diff) | |
| parent | daebdf3859ad3c912b068ea6b48e49f23c9ed0c2 (diff) | |
| download | podman-ec97739712336dbb0553c40560b7d84d035cd74b.tar.gz podman-ec97739712336dbb0553c40560b7d84d035cd74b.tar.bz2 podman-ec97739712336dbb0553c40560b7d84d035cd74b.zip | |
Merge pull request #10893 from baude/issue10795
Add container config to compat image inspect
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/api/handlers/types.go | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/pkg/api/handlers/types.go b/pkg/api/handlers/types.go index ee157cb56..59f948567 100644 --- a/pkg/api/handlers/types.go +++ b/pkg/api/handlers/types.go @@ -232,27 +232,32 @@ func ImageDataToImageInspect(ctx context.Context, l *libimage.Image) (*ImageInsp Name: info.GraphDriver.Name, Data: info.GraphDriver.Data, } + // Add in basic ContainerConfig to satisfy docker-compose + cc := new(dockerContainer.Config) + cc.Hostname = info.ID[0:11] // short ID is the hostname + cc.Volumes = info.Config.Volumes + dockerImageInspect := docker.ImageInspect{ - Architecture: info.Architecture, - Author: info.Author, - Comment: info.Comment, - Config: &config, - Created: l.Created().Format(time.RFC3339Nano), - DockerVersion: info.Version, - GraphDriver: graphDriver, - ID: "sha256:" + l.ID(), - Metadata: docker.ImageMetadata{}, - Os: info.Os, - OsVersion: info.Version, - Parent: info.Parent, - RepoDigests: info.RepoDigests, - RepoTags: info.RepoTags, - RootFS: rootfs, - Size: info.Size, - Variant: "", - VirtualSize: info.VirtualSize, + Architecture: info.Architecture, + Author: info.Author, + Comment: info.Comment, + Config: &config, + ContainerConfig: cc, + Created: l.Created().Format(time.RFC3339Nano), + DockerVersion: info.Version, + GraphDriver: graphDriver, + ID: "sha256:" + l.ID(), + Metadata: docker.ImageMetadata{}, + Os: info.Os, + OsVersion: info.Version, + Parent: info.Parent, + RepoDigests: info.RepoDigests, + RepoTags: info.RepoTags, + RootFS: rootfs, + Size: info.Size, + Variant: "", + VirtualSize: info.VirtualSize, } - // TODO: consider filling the container config. return &ImageInspect{dockerImageInspect}, nil } |