f3b7065bd8
The image's canonical reference is a name with a digest of the image's manifest, so in imageService.ImageStatus() and imageService.ListImages(), divide the image's name list into tagged and digested values, and if we have names, add canonical versions. In Server.ContainerStatus(), return the image name as it was given to us as the image, and the image digested reference as the image reference. In Server.ListImages(), be sure to only return tagged names in the RepoTags field. In Server.ImageStatus(), also return canonical references in the RepoDigests field. In Server.PullImage(), be sure that we consistently return the same image reference for an image, whether we ended up pulling it or not. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
24 lines
947 B
Go
24 lines
947 B
Go
package types
|
|
|
|
// ContainerInfo stores information about containers
|
|
type ContainerInfo struct {
|
|
Name string `json:"name"`
|
|
Pid int `json:"pid"`
|
|
Image string `json:"image"`
|
|
ImageRef string `json:"image_ref"`
|
|
CreatedTime int64 `json:"created_time"`
|
|
Labels map[string]string `json:"labels"`
|
|
Annotations map[string]string `json:"annotations"`
|
|
CrioAnnotations map[string]string `json:"crio_annotations"`
|
|
LogPath string `json:"log_path"`
|
|
Root string `json:"root"`
|
|
Sandbox string `json:"sandbox"`
|
|
IP string `json:"ip_address"`
|
|
}
|
|
|
|
// CrioInfo stores information about the crio daemon
|
|
type CrioInfo struct {
|
|
StorageDriver string `json:"storage_driver"`
|
|
StorageRoot string `json:"storage_root"`
|
|
CgroupDriver string `json:"cgroup_driver"`
|
|
}
|