summaryrefslogtreecommitdiff
path: root/pkg/api
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-06-15 13:08:28 -0400
committerGitHub <noreply@github.com>2020-06-15 13:08:28 -0400
commitb005465cb0ba78fea4563afefc34dac3df6fbd3d (patch)
treea4e52ab348c9827a4145578427d8208334524c16 /pkg/api
parent10c6c806ea6d7830c248d9c89cd5ec3a7a515a63 (diff)
parentec258365a73eb42394c99caa61e1a52eb01bf770 (diff)
downloadpodman-b005465cb0ba78fea4563afefc34dac3df6fbd3d.tar.gz
podman-b005465cb0ba78fea4563afefc34dac3df6fbd3d.tar.bz2
podman-b005465cb0ba78fea4563afefc34dac3df6fbd3d.zip
Merge pull request #6597 from rhatdan/image
Add some additional fields to imageinspect
Diffstat (limited to 'pkg/api')
-rw-r--r--pkg/api/handlers/types.go17
1 files changed, 9 insertions, 8 deletions
diff --git a/pkg/api/handlers/types.go b/pkg/api/handlers/types.go
index 79aeff2f8..c1e84ab5a 100644
--- a/pkg/api/handlers/types.go
+++ b/pkg/api/handlers/types.go
@@ -247,6 +247,7 @@ func ImageDataToImageInspect(ctx context.Context, l *libpodImage.Image) (*ImageI
if err != nil {
return nil, err
}
+
// TODO the rest of these still need wiring!
config := dockerContainer.Config{
// Hostname: "",
@@ -261,17 +262,17 @@ func ImageDataToImageInspect(ctx context.Context, l *libpodImage.Image) (*ImageI
// StdinOnce: false,
Env: info.Config.Env,
Cmd: info.Config.Cmd,
- // Healthcheck: nil,
+ //Healthcheck: l.ImageData.HealthCheck,
// ArgsEscaped: false,
// Image: "",
- // Volumes: nil,
- // WorkingDir: "",
- // Entrypoint: nil,
+ Volumes: info.Config.Volumes,
+ WorkingDir: info.Config.WorkingDir,
+ Entrypoint: info.Config.Entrypoint,
// NetworkDisabled: false,
// MacAddress: "",
- // OnBuild: nil,
- Labels: info.Labels,
- // StopSignal: "",
+ //OnBuild: info.Config.OnBuild,
+ Labels: info.Labels,
+ StopSignal: info.Config.StopSignal,
// StopTimeout: nil,
// Shell: nil,
}
@@ -285,7 +286,7 @@ func ImageDataToImageInspect(ctx context.Context, l *libpodImage.Image) (*ImageI
Comment: info.Comment,
Config: &config,
Created: l.Created().Format(time.RFC3339Nano),
- DockerVersion: "",
+ DockerVersion: info.Version,
GraphDriver: docker.GraphDriverData{},
ID: fmt.Sprintf("sha256:%s", l.ID()),
Metadata: docker.ImageMetadata{},