* Add docker pullable support.

* Fix inspect image bug.
* Fix remove image bug.
This commit is contained in:
Random-Liu
2016-10-07 21:35:18 -07:00
parent ead65fc25f
commit afa3414779
15 changed files with 166 additions and 38 deletions

View File

@@ -229,6 +229,13 @@ func (ds *dockerService) ContainerStatus(containerID string) (*runtimeApi.Contai
return nil, fmt.Errorf("failed to parse timestamp for container %q: %v", containerID, err)
}
// Convert the image id to pullable id.
ir, err := ds.client.InspectImageByID(r.Image)
if err != nil {
return nil, fmt.Errorf("unable to inspect docker image %q while inspecting docker container %q: %v", r.Image, containerID, err)
}
imageID := toPullableImageID(r.Image, ir)
// Convert the mounts.
mounts := []*runtimeApi.Mount{}
for i := range r.Mounts {
@@ -293,7 +300,7 @@ func (ds *dockerService) ContainerStatus(containerID string) (*runtimeApi.Contai
Id: &r.ID,
Metadata: metadata,
Image: &runtimeApi.ImageSpec{Image: &r.Config.Image},
ImageRef: &r.Image,
ImageRef: &imageID,
Mounts: mounts,
ExitCode: &exitCode,
State: &state,