Merge pull request #4165 from mtrmac/c-image-4

Update c/image to v4.0.0 + Buildah to 1.11.3

14 files changed, 45 insertions, 45 deletions

diff --git a/libpod/container.go b/libpod/container.go
index 3d8e58375..f36ddbd3f 100644
--- a/libpod/container.go
+++ b/libpod/container.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/containernetworking/cni/pkg/types"
 	cnitypes "github.com/containernetworking/cni/pkg/types/current"
-	"github.com/containers/image/manifest"
+	"github.com/containers/image/v4/manifest"
 	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/libpod/lock"
 	"github.com/containers/libpod/pkg/namespaces"
diff --git a/libpod/container_commit.go b/libpod/container_commit.go
index 8dfeee9b8..570d406b7 100644
--- a/libpod/container_commit.go
+++ b/libpod/container_commit.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/containers/buildah"
 	"github.com/containers/buildah/util"
-	is "github.com/containers/image/storage"
+	is "github.com/containers/image/v4/storage"
 	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/libpod/events"
 	"github.com/containers/libpod/libpod/image"
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go
index 3c32a2f45..5a92b3e54 100644
--- a/libpod/container_inspect.go
+++ b/libpod/container_inspect.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containers/image/manifest"
+	"github.com/containers/image/v4/manifest"
 	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/libpod/driver"
 	"github.com/containers/libpod/pkg/util"
diff --git a/libpod/image/docker_registry_options.go b/libpod/image/docker_registry_options.go
index 60bb3c33f..d205fe4ac 100644
--- a/libpod/image/docker_registry_options.go
+++ b/libpod/image/docker_registry_options.go
@@ -3,8 +3,8 @@ package image
 import (
 	"fmt"
 
-	"github.com/containers/image/docker/reference"
-	"github.com/containers/image/types"
+	"github.com/containers/image/v4/docker/reference"
+	"github.com/containers/image/v4/types"
 
 	podmanVersion "github.com/containers/libpod/version"
 )
diff --git a/libpod/image/image.go b/libpod/image/image.go
index 855da8611..9adefb5c5 100644
--- a/libpod/image/image.go
+++ b/libpod/image/image.go
@@ -12,17 +12,17 @@ import (
 	"syscall"
 	"time"
 
-	cp "github.com/containers/image/copy"
-	"github.com/containers/image/directory"
-	dockerarchive "github.com/containers/image/docker/archive"
-	"github.com/containers/image/docker/reference"
-	"github.com/containers/image/manifest"
-	ociarchive "github.com/containers/image/oci/archive"
-	is "github.com/containers/image/storage"
-	"github.com/containers/image/tarball"
-	"github.com/containers/image/transports"
-	"github.com/containers/image/transports/alltransports"
-	"github.com/containers/image/types"
+	cp "github.com/containers/image/v4/copy"
+	"github.com/containers/image/v4/directory"
+	dockerarchive "github.com/containers/image/v4/docker/archive"
+	"github.com/containers/image/v4/docker/reference"
+	"github.com/containers/image/v4/manifest"
+	ociarchive "github.com/containers/image/v4/oci/archive"
+	is "github.com/containers/image/v4/storage"
+	"github.com/containers/image/v4/tarball"
+	"github.com/containers/image/v4/transports"
+	"github.com/containers/image/v4/transports/alltransports"
+	"github.com/containers/image/v4/types"
 	"github.com/containers/libpod/libpod/driver"
 	"github.com/containers/libpod/libpod/events"
 	"github.com/containers/libpod/pkg/inspect"
diff --git a/libpod/image/parts.go b/libpod/image/parts.go
index dfdf0b08a..69bc44cdd 100644
--- a/libpod/image/parts.go
+++ b/libpod/image/parts.go
@@ -3,7 +3,7 @@ package image
 import (
 	"strings"
 
-	"github.com/containers/image/docker/reference"
+	"github.com/containers/image/v4/docker/reference"
 	"github.com/pkg/errors"
 )
 
diff --git a/libpod/image/pull.go b/libpod/image/pull.go
index dbf3a4ef5..36950b6f3 100644
--- a/libpod/image/pull.go
+++ b/libpod/image/pull.go
@@ -7,17 +7,17 @@ import (
 	"path/filepath"
 	"strings"
 
-	cp "github.com/containers/image/copy"
-	"github.com/containers/image/directory"
-	"github.com/containers/image/docker"
-	dockerarchive "github.com/containers/image/docker/archive"
-	"github.com/containers/image/docker/tarfile"
-	ociarchive "github.com/containers/image/oci/archive"
-	oci "github.com/containers/image/oci/layout"
-	is "github.com/containers/image/storage"
-	"github.com/containers/image/transports"
-	"github.com/containers/image/transports/alltransports"
-	"github.com/containers/image/types"
+	cp "github.com/containers/image/v4/copy"
+	"github.com/containers/image/v4/directory"
+	"github.com/containers/image/v4/docker"
+	dockerarchive "github.com/containers/image/v4/docker/archive"
+	"github.com/containers/image/v4/docker/tarfile"
+	ociarchive "github.com/containers/image/v4/oci/archive"
+	oci "github.com/containers/image/v4/oci/layout"
+	is "github.com/containers/image/v4/storage"
+	"github.com/containers/image/v4/transports"
+	"github.com/containers/image/v4/transports/alltransports"
+	"github.com/containers/image/v4/types"
 	"github.com/containers/libpod/libpod/events"
 	"github.com/containers/libpod/pkg/registries"
 	"github.com/hashicorp/go-multierror"
diff --git a/libpod/image/pull_test.go b/libpod/image/pull_test.go
index 3890c5e6c..131b8b1f6 100644
--- a/libpod/image/pull_test.go
+++ b/libpod/image/pull_test.go
@@ -9,9 +9,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/containers/image/transports"
-	"github.com/containers/image/transports/alltransports"
-	"github.com/containers/image/types"
+	"github.com/containers/image/v4/transports"
+	"github.com/containers/image/v4/transports/alltransports"
+	"github.com/containers/image/v4/types"
 	"github.com/containers/storage"
 	"github.com/containers/storage/pkg/idtools"
 	"github.com/stretchr/testify/assert"
diff --git a/libpod/image/search.go b/libpod/image/search.go
index 82ef4f75a..0313c2d6e 100644
--- a/libpod/image/search.go
+++ b/libpod/image/search.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/containers/image/docker"
-	"github.com/containers/image/types"
+	"github.com/containers/image/v4/docker"
+	"github.com/containers/image/v4/types"
 	sysreg "github.com/containers/libpod/pkg/registries"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
diff --git a/libpod/image/utils.go b/libpod/image/utils.go
index 544796a4b..e4ff1cfc4 100644
--- a/libpod/image/utils.go
+++ b/libpod/image/utils.go
@@ -7,10 +7,10 @@ import (
 	"regexp"
 	"strings"
 
-	cp "github.com/containers/image/copy"
-	"github.com/containers/image/docker/reference"
-	"github.com/containers/image/signature"
-	"github.com/containers/image/types"
+	cp "github.com/containers/image/v4/copy"
+	"github.com/containers/image/v4/docker/reference"
+	"github.com/containers/image/v4/signature"
+	"github.com/containers/image/v4/types"
 	"github.com/containers/storage"
 	"github.com/pkg/errors"
 )
diff --git a/libpod/options.go b/libpod/options.go
index 22ab22a95..ee44439ac 100644
--- a/libpod/options.go
+++ b/libpod/options.go
@@ -7,7 +7,7 @@ import (
 	"regexp"
 	"syscall"
 
-	"github.com/containers/image/manifest"
+	"github.com/containers/image/v4/manifest"
 	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/libpod/events"
 	"github.com/containers/libpod/pkg/namespaces"
diff --git a/libpod/runtime.go b/libpod/runtime.go
index 9f3549e00..cdb5670ba 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -17,8 +17,8 @@ import (
 	"time"
 
 	"github.com/BurntSushi/toml"
-	is "github.com/containers/image/storage"
-	"github.com/containers/image/types"
+	is "github.com/containers/image/v4/storage"
+	"github.com/containers/image/v4/types"
 	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/libpod/events"
 	"github.com/containers/libpod/libpod/image"
diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go
index 20dee4080..8cc501629 100644
--- a/libpod/runtime_img.go
+++ b/libpod/runtime_img.go
@@ -17,9 +17,9 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
-	"github.com/containers/image/directory"
-	dockerarchive "github.com/containers/image/docker/archive"
-	ociarchive "github.com/containers/image/oci/archive"
+	"github.com/containers/image/v4/directory"
+	dockerarchive "github.com/containers/image/v4/docker/archive"
+	ociarchive "github.com/containers/image/v4/oci/archive"
 	"github.com/opencontainers/image-spec/specs-go/v1"
 )
 
diff --git a/libpod/storage.go b/libpod/storage.go
index 0814672be..9a06c96fd 100644
--- a/libpod/storage.go
+++ b/libpod/storage.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
-	istorage "github.com/containers/image/storage"
-	"github.com/containers/image/types"
+	istorage "github.com/containers/image/v4/storage"
+	"github.com/containers/image/v4/types"
 	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/storage"
 	"github.com/opencontainers/image-spec/specs-go/v1"