Bump image-relocation and ggcr

Thereby gain support for foreign layers and for relocating image indexes.

Gopkg.toml

@@ -53,15 +53,15 @@
 
 [[constraint]]
   name = "github.com/pivotal/image-relocation"
-  version = "v0.1"
+  version = "v0.4"
 
 [[constraint]]
   name = "github.com/deislabs/cnab-go"
   version = "v0.4.0-beta1"
 
 [[override]]
   name = "github.com/google/go-containerregistry"
-  revision = "5296537b6d5d12241dd0a8b1ef70a59cba62f48c"
+  revision = "ef12d49c8daf6a6d72978966d5945e39bb898b4a"
 
 [[override]]
   name = "k8s.io/apimachinery"

pkg/imagestore/ocilayout/ocilayout.go

@@ -6,10 +6,10 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/deislabs/duffle/pkg/imagestore"
 	"github.com/pivotal/image-relocation/pkg/image"
 	"github.com/pivotal/image-relocation/pkg/registry"
-
-	"github.com/deislabs/duffle/pkg/imagestore"
+	"github.com/pivotal/image-relocation/pkg/registry/ggcr"
 )
 
 // ociLayout is an image store which stores images as an OCI image layout.
@@ -26,7 +26,7 @@ func Create(options ...imagestore.Option) (imagestore.Store, error) {
 		return nil, err
 	}
 
-	layout, err := registry.NewRegistryClient().NewLayout(layoutDir)
+	layout, err := ggcr.NewRegistryClient().NewLayout(layoutDir)
 	if err != nil {
 		return nil, err
 	}
@@ -42,7 +42,7 @@ func LocateOciLayout(archiveDir string) (imagestore.Store, error) {
 	if _, err := os.Stat(layoutDir); os.IsNotExist(err) {
 		return nil, err
 	}
-	layout, err := registry.NewRegistryClient().ReadLayout(layoutDir)
+	layout, err := ggcr.NewRegistryClient().ReadLayout(layoutDir)
 	if err != nil {
 		return nil, err
 	}

pkg/imagestore/remote/remote.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/pivotal/image-relocation/pkg/image"
 	"github.com/pivotal/image-relocation/pkg/registry"
+	"github.com/pivotal/image-relocation/pkg/registry/ggcr"
 
 	"github.com/deislabs/duffle/pkg/imagestore"
 )
@@ -16,7 +17,7 @@ type remote struct {
 
 func Create(...imagestore.Option) (imagestore.Store, error) {
 	return &remote{
-		registryClient: registry.NewRegistryClient(),
+		registryClient: ggcr.NewRegistryClient(),
 	}, nil
 }