Merge pull request #3590 from rhatdan/ro

Add support for listing read/only and read/write images

3 files changed, 35 insertions, 1 deletions

diff --git a/pkg/adapter/runtime.go b/pkg/adapter/runtime.go
index e65f07898..dc193c738 100644
--- a/pkg/adapter/runtime.go
+++ b/pkg/adapter/runtime.go
@@ -85,16 +85,27 @@ func getRuntime(runtime *libpod.Runtime) (*LocalRuntime, error) {
 
 // GetImages returns a slice of images in containerimages
 func (r *LocalRuntime) GetImages() ([]*ContainerImage, error) {
+	return r.getImages(false)
+}
+
+// GetRWImages returns a slice of read/write images in containerimages
+func (r *LocalRuntime) GetRWImages() ([]*ContainerImage, error) {
+	return r.getImages(true)
+}
+
+func (r *LocalRuntime) getImages(rwOnly bool) ([]*ContainerImage, error) {
 	var containerImages []*ContainerImage
 	images, err := r.Runtime.ImageRuntime().GetImages()
 	if err != nil {
 		return nil, err
 	}
 	for _, i := range images {
+		if rwOnly && i.IsReadOnly() {
+			continue
+		}
 		containerImages = append(containerImages, &ContainerImage{i})
 	}
 	return containerImages, nil
-
 }
 
 // NewImageFromLocal returns a containerimage representation of a image from local storage
diff --git a/pkg/adapter/runtime_remote.go b/pkg/adapter/runtime_remote.go
index db3f23629..9fae39df0 100644
--- a/pkg/adapter/runtime_remote.go
+++ b/pkg/adapter/runtime_remote.go
@@ -129,6 +129,7 @@ type remoteImage struct {
 	isParent    bool
 	Runtime     *LocalRuntime
 	TopLayer    string
+	ReadOnly    bool
 }
 
 // Container ...
@@ -169,12 +170,24 @@ type remoteVolume struct {
 
 // GetImages returns a slice of containerimages over a varlink connection
 func (r *LocalRuntime) GetImages() ([]*ContainerImage, error) {
+	return r.getImages(false)
+}
+
+// GetRWImages returns a slice of read/write containerimages over a varlink connection
+func (r *LocalRuntime) GetRWImages() ([]*ContainerImage, error) {
+	return r.getImages(true)
+}
+
+func (r *LocalRuntime) getImages(rwOnly bool) ([]*ContainerImage, error) {
 	var newImages []*ContainerImage
 	images, err := iopodman.ListImages().Call(r.Conn)
 	if err != nil {
 		return nil, err
 	}
 	for _, i := range images {
+		if rwOnly && i.ReadOnly {
+			continue
+		}
 		name := i.Id
 		if len(i.RepoTags) > 1 {
 			name = i.RepoTags[0]
@@ -207,6 +220,7 @@ func imageInListToContainerImage(i iopodman.Image, name string, runtime *LocalRu
 		isParent:    i.IsParent,
 		Runtime:     runtime,
 		TopLayer:    i.TopLayer,
+		ReadOnly:    i.ReadOnly,
 	}
 	return &ContainerImage{ri}, nil
 }
@@ -302,6 +316,11 @@ func (ci *ContainerImage) Created() time.Time {
 	return ci.remoteImage.Created
 }
 
+// IsReadOnly returns whether the image is ReadOnly
+func (ci *ContainerImage) IsReadOnly() bool {
+	return ci.remoteImage.ReadOnly
+}
+
 // Size returns the size of the image
 func (ci *ContainerImage) Size(ctx context.Context) (*uint64, error) {
 	usize := uint64(ci.remoteImage.Size)
diff --git a/pkg/varlinkapi/images.go b/pkg/varlinkapi/images.go
index 2bebfd406..0ead1c23d 100644
--- a/pkg/varlinkapi/images.go
+++ b/pkg/varlinkapi/images.go
@@ -69,6 +69,7 @@ func (i *LibpodAPI) ListImages(call iopodman.VarlinkCall) error {
 			Containers:  int64(len(containers)),
 			Labels:      labels,
 			IsParent:    isParent,
+			ReadOnly:    image.IsReadOnly(),
 		}
 		imageList = append(imageList, i)
 	}
@@ -98,6 +99,8 @@ func (i *LibpodAPI) GetImage(call iopodman.VarlinkCall, id string) error {
 		return err
 	}
 
+	fmt.Println("DAN isReadOnly %d", newImage.IsReadOnly())
+
 	il := iopodman.Image{
 		Id:          newImage.ID(),
 		ParentId:    newImage.Parent,
@@ -109,6 +112,7 @@ func (i *LibpodAPI) GetImage(call iopodman.VarlinkCall, id string) error {
 		Containers:  int64(len(containers)),
 		Labels:      labels,
 		TopLayer:    newImage.TopLayer(),
+		ReadOnly:    newImage.IsReadOnly(),
 	}
 	return call.ReplyGetImage(il)
 }