1 files changed, 84 insertions, 9 deletions

diff --git a/libpod/adapter/runtime_remote.go b/libpod/adapter/runtime_remote.go
index 4dfae34e1..d0d827582 100644
--- a/libpod/adapter/runtime_remote.go
+++ b/libpod/adapter/runtime_remote.go
@@ -13,6 +13,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/containers/image/docker/reference"
 	"github.com/containers/image/types"
 	"github.com/containers/libpod/cmd/podman/cliconfig"
 	"github.com/containers/libpod/cmd/podman/varlink"
@@ -91,6 +92,18 @@ type remoteContainer struct {
 	state   *libpod.ContainerState
 }
 
+type VolumeFilter func(*Volume) bool
+
+// Volume is embed for libpod volumes
+type Volume struct {
+	remoteVolume
+}
+
+type remoteVolume struct {
+	Runtime *LocalRuntime
+	config  *libpod.VolumeConfig
+}
+
 // GetImages returns a slice of containerimages over a varlink connection
 func (r *LocalRuntime) GetImages() ([]*ContainerImage, error) {
 	var newImages []*ContainerImage
@@ -112,8 +125,8 @@ func (r *LocalRuntime) GetImages() ([]*ContainerImage, error) {
 	return newImages, nil
 }
 
-func imageInListToContainerImage(i iopodman.ImageInList, name string, runtime *LocalRuntime) (*ContainerImage, error) {
-	created, err := splitStringDate(i.Created)
+func imageInListToContainerImage(i iopodman.Image, name string, runtime *LocalRuntime) (*ContainerImage, error) {
+	created, err := time.ParseInLocation(time.RFC3339, i.Created, time.UTC)
 	if err != nil {
 		return nil, err
 	}
@@ -182,12 +195,6 @@ func (r *LocalRuntime) New(ctx context.Context, name, signaturePolicyPath, authf
 	return newImage, nil
 }
 
-func splitStringDate(d string) (time.Time, error) {
-	fields := strings.Fields(d)
-	t := fmt.Sprintf("%sT%sZ", fields[0], fields[1])
-	return time.ParseInLocation(time.RFC3339Nano, t, time.UTC)
-}
-
 // IsParent goes through the layers in the store and checks if i.TopLayer is
 // the parent of any other layer in store. Double check that image with that
 // layer exists as well.
@@ -251,7 +258,7 @@ func (ci *ContainerImage) History(ctx context.Context) ([]*image.History, error)
 		return nil, err
 	}
 	for _, h := range reply {
-		created, err := splitStringDate(h.Created)
+		created, err := time.ParseInLocation(time.RFC3339, h.Created, time.UTC)
 		if err != nil {
 			return nil, err
 		}
@@ -459,3 +466,71 @@ func (r *LocalRuntime) RemoveVolumes(ctx context.Context, c *cliconfig.VolumeRmV
 	}
 	return iopodman.VolumeRemove().Call(r.Conn, rmOpts)
 }
+
+func (r *LocalRuntime) Push(ctx context.Context, srcName, destination, manifestMIMEType, authfile, signaturePolicyPath string, writer io.Writer, forceCompress bool, signingOptions image.SigningOptions, dockerRegistryOptions *image.DockerRegistryOptions, additionalDockerArchiveTags []reference.NamedTagged) error {
+
+	tls := true
+	if dockerRegistryOptions.DockerInsecureSkipTLSVerify == types.OptionalBoolTrue {
+		tls = false
+	}
+	reply, err := iopodman.PushImage().Send(r.Conn, varlink.More, srcName, destination, tls, signaturePolicyPath, "", dockerRegistryOptions.DockerCertPath, forceCompress, manifestMIMEType, signingOptions.RemoveSignatures, signingOptions.SignBy)
+	if err != nil {
+		return err
+	}
+	for {
+		responses, flags, err := reply()
+		if err != nil {
+			return err
+		}
+		for _, line := range responses.Logs {
+			fmt.Print(line)
+		}
+		if flags&varlink.Continues == 0 {
+			break
+		}
+	}
+
+	return err
+}
+
+// InspectVolumes returns a slice of volumes based on an arg list or --all
+func (r *LocalRuntime) InspectVolumes(ctx context.Context, c *cliconfig.VolumeInspectValues) ([]*Volume, error) {
+	reply, err := iopodman.GetVolumes().Call(r.Conn, c.InputArgs, c.All)
+	if err != nil {
+		return nil, err
+	}
+	return varlinkVolumeToVolume(r, reply), nil
+}
+
+//Volumes returns a slice of adapter.volumes based on information about libpod
+// volumes over a varlink connection
+func (r *LocalRuntime) Volumes(ctx context.Context) ([]*Volume, error) {
+	reply, err := iopodman.GetVolumes().Call(r.Conn, []string{}, true)
+	if err != nil {
+		return nil, err
+	}
+	return varlinkVolumeToVolume(r, reply), nil
+}
+
+func varlinkVolumeToVolume(r *LocalRuntime, volumes []iopodman.Volume) []*Volume {
+	var vols []*Volume
+	for _, v := range volumes {
+		volumeConfig := libpod.VolumeConfig{
+			Name:       v.Name,
+			Labels:     v.Labels,
+			MountPoint: v.MountPoint,
+			Driver:     v.Driver,
+			Options:    v.Options,
+			Scope:      v.Scope,
+		}
+		n := remoteVolume{
+			Runtime: r,
+			config:  &volumeConfig,
+		}
+		newVol := Volume{
+			n,
+		}
+		vols = append(vols, &newVol)
+	}
+	return vols
+}