migrate Podman to containers/common/libimage

Migrate the Podman code base over to `common/libimage` which replaces
`libpod/image` and a lot of glue code entirely.

Note that I tried to leave bread crumbs for changed tests.

Miscellaneous changes:

 * Some errors yield different messages which required to alter some
   tests.

 * I fixed some pre-existing issues in the code.  Others were marked as
   `//TODO`s to prevent the PR from exploding.

 * The `NamesHistory` of an image is returned as is from the storage.
   Previously, we did some filtering which I think is undesirable.
   Instead we should return the data as stored in the storage.

 * Touched handlers use the ABI interfaces where possible.

 * Local image resolution: previously Podman would match "foo" on
   "myfoo".  This behaviour has been changed and Podman will now
   only match on repository boundaries such that "foo" would match
   "my/foo" but not "myfoo".  I consider the old behaviour to be a
   bug, at the very least an exotic corner case.

 * Futhermore, "foo:none" does *not* resolve to a local image "foo"
   without tag anymore.  It's a hill I am (almost) willing to die on.

 * `image prune` prints the IDs of pruned images.  Previously, in some
   cases, the names were printed instead.  The API clearly states ID,
   so we should stick to it.

 * Compat endpoint image removal with _force_ deletes the entire not
   only the specified tag.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

1 files changed, 14 insertions, 16 deletions

diff --git a/libpod/runtime.go b/libpod/runtime.go
index 3518ed25a..80fe92b54 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -14,13 +14,13 @@ import (
 	"sync"
 	"syscall"
 
+	"github.com/containers/common/libimage"
 	"github.com/containers/common/pkg/config"
 	"github.com/containers/image/v5/pkg/sysregistriesv2"
 	is "github.com/containers/image/v5/storage"
 	"github.com/containers/image/v5/types"
 	"github.com/containers/podman/v3/libpod/define"
 	"github.com/containers/podman/v3/libpod/events"
-	"github.com/containers/podman/v3/libpod/image"
 	"github.com/containers/podman/v3/libpod/lock"
 	"github.com/containers/podman/v3/libpod/plugin"
 	"github.com/containers/podman/v3/libpod/shutdown"
@@ -76,7 +76,7 @@ type Runtime struct {
 	runtimeFlags      []string
 	netPlugin         ocicni.CNIPlugin
 	conmonPath        string
-	imageRuntime      *image.Runtime
+	libimageRuntime   *libimage.Runtime
 	lockManager       lock.Manager
 
 	// doRenumber indicates that the runtime should perform a lock renumber
@@ -371,9 +371,7 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (retErr error) {
 		return err
 	}
 	runtime.eventer = eventer
-	if runtime.imageRuntime != nil {
-		runtime.imageRuntime.Eventer = eventer
-	}
+	// TODO: events for libimage
 
 	// Set up containers/image
 	if runtime.imageContext == nil {
@@ -836,21 +834,21 @@ func (r *Runtime) configureStore() error {
 	// images
 	r.storageService = getStorageService(r.store)
 
-	ir := image.NewImageRuntimeFromStore(r.store)
-	ir.SignaturePolicyPath = r.config.Engine.SignaturePolicyPath
-	ir.EventsLogFilePath = r.config.Engine.EventsLogFilePath
-	ir.EventsLogger = r.config.Engine.EventsLogger
-
-	r.imageRuntime = ir
+	runtimeOptions := &libimage.RuntimeOptions{
+		SystemContext: r.imageContext,
+	}
+	libimageRuntime, err := libimage.RuntimeFromStore(store, runtimeOptions)
+	if err != nil {
+		return err
+	}
+	r.libimageRuntime = libimageRuntime
 
 	return nil
 }
 
-// ImageRuntime returns the imageruntime for image operations.
-// If WithNoStore() was used, no image runtime will be available, and this
-// function will return nil.
-func (r *Runtime) ImageRuntime() *image.Runtime {
-	return r.imageRuntime
+// LibimageRuntime ... to allow for a step-by-step migration to libimage.
+func (r *Runtime) LibimageRuntime() *libimage.Runtime {
+	return r.libimageRuntime
 }
 
 // SystemContext returns the imagecontext