summaryrefslogtreecommitdiff
path: root/libpod/image
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-07-06 10:58:38 -0400
committerGitHub <noreply@github.com>2020-07-06 10:58:38 -0400
commit9eac75a967e3459b32b1acd220afb49b60f5e5aa (patch)
treef716dd8517bc98dbbb6d36c4c7984aa7ea119c25 /libpod/image
parent778f34a15ca22d6f469a90fda8e43e1b773c7745 (diff)
parent8489dc43458da43d12ae37bac63753811acf96d9 (diff)
downloadpodman-9eac75a967e3459b32b1acd220afb49b60f5e5aa.tar.gz
podman-9eac75a967e3459b32b1acd220afb49b60f5e5aa.tar.bz2
podman-9eac75a967e3459b32b1acd220afb49b60f5e5aa.zip
Merge pull request #6864 from vrothberg/v2-module
move go module to v2
Diffstat (limited to 'libpod/image')
-rw-r--r--libpod/image/docker_registry_options.go2
-rw-r--r--libpod/image/filters.go2
-rw-r--r--libpod/image/image.go10
-rw-r--r--libpod/image/image_test.go4
-rw-r--r--libpod/image/prune.go4
-rw-r--r--libpod/image/pull.go4
-rw-r--r--libpod/image/search.go2
7 files changed, 14 insertions, 14 deletions
diff --git a/libpod/image/docker_registry_options.go b/libpod/image/docker_registry_options.go
index 081e7ef4f..a43a94896 100644
--- a/libpod/image/docker_registry_options.go
+++ b/libpod/image/docker_registry_options.go
@@ -6,7 +6,7 @@ import (
"github.com/containers/buildah/pkg/parse"
"github.com/containers/image/v5/docker/reference"
"github.com/containers/image/v5/types"
- podmanVersion "github.com/containers/libpod/version"
+ podmanVersion "github.com/containers/libpod/v2/version"
)
// DockerRegistryOptions encapsulates settings that affect how we connect or
diff --git a/libpod/image/filters.go b/libpod/image/filters.go
index 9d99fb344..11d081ec3 100644
--- a/libpod/image/filters.go
+++ b/libpod/image/filters.go
@@ -8,7 +8,7 @@ import (
"strings"
"time"
- "github.com/containers/libpod/pkg/inspect"
+ "github.com/containers/libpod/v2/pkg/inspect"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
diff --git a/libpod/image/image.go b/libpod/image/image.go
index 83e7467e9..048ec825d 100644
--- a/libpod/image/image.go
+++ b/libpod/image/image.go
@@ -26,11 +26,11 @@ import (
"github.com/containers/image/v5/transports"
"github.com/containers/image/v5/transports/alltransports"
"github.com/containers/image/v5/types"
- "github.com/containers/libpod/libpod/driver"
- "github.com/containers/libpod/libpod/events"
- "github.com/containers/libpod/pkg/inspect"
- "github.com/containers/libpod/pkg/registries"
- "github.com/containers/libpod/pkg/util"
+ "github.com/containers/libpod/v2/libpod/driver"
+ "github.com/containers/libpod/v2/libpod/events"
+ "github.com/containers/libpod/v2/pkg/inspect"
+ "github.com/containers/libpod/v2/pkg/registries"
+ "github.com/containers/libpod/v2/pkg/util"
"github.com/containers/storage"
digest "github.com/opencontainers/go-digest"
imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1"
diff --git a/libpod/image/image_test.go b/libpod/image/image_test.go
index 74067853e..645f8d3f3 100644
--- a/libpod/image/image_test.go
+++ b/libpod/image/image_test.go
@@ -7,8 +7,8 @@ import (
"os"
"testing"
- "github.com/containers/libpod/libpod/events"
- "github.com/containers/libpod/pkg/util"
+ "github.com/containers/libpod/v2/libpod/events"
+ "github.com/containers/libpod/v2/pkg/util"
"github.com/containers/storage"
"github.com/containers/storage/pkg/reexec"
"github.com/opencontainers/go-digest"
diff --git a/libpod/image/prune.go b/libpod/image/prune.go
index 518795173..5ad7a9a5e 100644
--- a/libpod/image/prune.go
+++ b/libpod/image/prune.go
@@ -5,8 +5,8 @@ import (
"strings"
"time"
- "github.com/containers/libpod/libpod/events"
- "github.com/containers/libpod/pkg/timetype"
+ "github.com/containers/libpod/v2/libpod/events"
+ "github.com/containers/libpod/v2/pkg/timetype"
"github.com/containers/storage"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
diff --git a/libpod/image/pull.go b/libpod/image/pull.go
index 24909a59a..f0cde2012 100644
--- a/libpod/image/pull.go
+++ b/libpod/image/pull.go
@@ -18,8 +18,8 @@ import (
"github.com/containers/image/v5/transports"
"github.com/containers/image/v5/transports/alltransports"
"github.com/containers/image/v5/types"
- "github.com/containers/libpod/libpod/events"
- "github.com/containers/libpod/pkg/registries"
+ "github.com/containers/libpod/v2/libpod/events"
+ "github.com/containers/libpod/v2/pkg/registries"
"github.com/hashicorp/go-multierror"
"github.com/opentracing/opentracing-go"
"github.com/pkg/errors"
diff --git a/libpod/image/search.go b/libpod/image/search.go
index 72dba668f..ee1ff0312 100644
--- a/libpod/image/search.go
+++ b/libpod/image/search.go
@@ -8,7 +8,7 @@ import (
"github.com/containers/image/v5/docker"
"github.com/containers/image/v5/types"
- sysreg "github.com/containers/libpod/pkg/registries"
+ sysreg "github.com/containers/libpod/v2/pkg/registries"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"golang.org/x/sync/semaphore"