1 files changed, 70 insertions, 10 deletions
diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go
index 20af0356f..d136f42fd 100644
--- a/pkg/domain/entities/images.go
+++ b/pkg/domain/entities/images.go
@@ -4,6 +4,8 @@ import (
 	"net/url"
 
 	"github.com/containers/image/v5/manifest"
+	"github.com/containers/image/v5/types"
+	"github.com/containers/libpod/pkg/inspect"
 	docker "github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/opencontainers/go-digest"
@@ -11,7 +13,6 @@ import (
 )
 
 type Image struct {
-	IdOrNamed
 	ID              string                 `json:"Id"`
 	RepoTags        []string               `json:",omitempty"`
 	RepoDigests     []string               `json:",omitempty"`
@@ -110,11 +111,37 @@ type ImageHistoryReport struct {
 	Layers []ImageHistoryLayer
 }
 
-type ImageInspectOptions struct {
-	TypeObject string `json:",omitempty"`
-	Format     string `json:",omitempty"`
-	Size       bool   `json:",omitempty"`
-	Latest     bool   `json:",omitempty"`
+// ImagePullOptions are the arguments for pulling images.
+type ImagePullOptions struct {
+	// AllTags can be specified to pull all tags of the spiecifed image. Note
+	// that this only works if the specified image does not include a tag.
+	AllTags bool
+	// Authfile is the path to the authentication file. Ignored for remote
+	// calls.
+	Authfile string
+	// CertDir is the path to certificate directories.  Ignored for remote
+	// calls.
+	CertDir string
+	// Credentials for authenticating against the registry in the format
+	// USERNAME:PASSWORD.
+	Credentials string
+	// OverrideArch will overwrite the local architecture for image pulls.
+	OverrideArch string
+	// OverrideOS will overwrite the local operating system (OS) for image
+	// pulls.
+	OverrideOS string
+	// Quiet can be specified to suppress pull progress when pulling.  Ignored
+	// for remote calls.
+	Quiet bool
+	// SignaturePolicy to use when pulling.  Ignored for remote calls.
+	SignaturePolicy string
+	// TLSVerify to enable/disable HTTPS and certificate verification.
+	TLSVerify types.OptionalBool
+}
+
+// ImagePullReport is the response from pulling one or more images.
+type ImagePullReport struct {
+	Images []string
 }
 
 type ImageListOptions struct {
@@ -123,10 +150,6 @@ type ImageListOptions struct {
 	Filters url.Values `json:"filters" schema:"filters"`
 }
 
-// type ImageListReport struct {
-// 	Images []ImageSummary
-// }
-
 type ImagePruneOptions struct {
 	All     bool       `json:"all" schema:"all"`
 	Filter  []string   `json:"filter" schema:"filter"`
@@ -137,3 +160,40 @@ type ImagePruneReport struct {
 	Report Report
 	Size   int64
 }
+
+type ImageTagOptions struct{}
+type ImageUntagOptions struct{}
+
+type ImageData struct {
+	*inspect.ImageData
+}
+
+type ImageInspectReport struct {
+	Images []*ImageData
+	Errors map[string]error
+}
+
+type ImageLoadOptions struct {
+	Name            string
+	Tag             string
+	Input           string
+	Quiet           bool
+	SignaturePolicy string
+}
+
+type ImageLoadReport struct {
+	Name string
+}
+
+type ImageImportOptions struct {
+	Changes     []string
+	Message     string
+	Quiet       bool
+	Reference   string
+	Source      string
+	SourceIsURL bool
+}
+
+type ImageImportReport struct {
+	Id string
+}