diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-28 10:12:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-28 10:12:55 -0400 |
| commit | 288ebec6e737c105fa0ef43412de4e0a8997feb9 (patch) | |
| tree | 57eb1b59866fd63b7618b885fcbfb1e614709cf4 /libpod/image | |
| parent | 6ed9868a34a875359852a910c23248946de59d20 (diff) | |
| parent | a5e37ad2805b2594339e0d5d41da0e0cc37e4f4a (diff) | |
| download | podman-288ebec6e737c105fa0ef43412de4e0a8997feb9.tar.gz podman-288ebec6e737c105fa0ef43412de4e0a8997feb9.tar.bz2 podman-288ebec6e737c105fa0ef43412de4e0a8997feb9.zip | |
Merge pull request #6909 from rhatdan/podman
Switch all references to github.com/containers/libpod -> podman
Diffstat (limited to 'libpod/image')
| -rw-r--r-- | libpod/image/docker_registry_options.go | 2 | ||||
| -rw-r--r-- | libpod/image/filters.go | 2 | ||||
| -rw-r--r-- | libpod/image/image.go | 10 | ||||
| -rw-r--r-- | libpod/image/image_test.go | 4 | ||||
| -rw-r--r-- | libpod/image/prune.go | 4 | ||||
| -rw-r--r-- | libpod/image/pull.go | 4 | ||||
| -rw-r--r-- | libpod/image/search.go | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/libpod/image/docker_registry_options.go b/libpod/image/docker_registry_options.go index a43a94896..c434f0259 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/v2/version" + podmanVersion "github.com/containers/podman/v2/version" ) // DockerRegistryOptions encapsulates settings that affect how we connect or diff --git a/libpod/image/filters.go b/libpod/image/filters.go index 11d081ec3..9738a7d5e 100644 --- a/libpod/image/filters.go +++ b/libpod/image/filters.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/containers/libpod/v2/pkg/inspect" + "github.com/containers/podman/v2/pkg/inspect" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/libpod/image/image.go b/libpod/image/image.go index e2bd1ad5d..14ffad4bf 100644 --- a/libpod/image/image.go +++ b/libpod/image/image.go @@ -27,11 +27,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/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/podman/v2/libpod/driver" + "github.com/containers/podman/v2/libpod/events" + "github.com/containers/podman/v2/pkg/inspect" + "github.com/containers/podman/v2/pkg/registries" + "github.com/containers/podman/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 645f8d3f3..2704b8baf 100644 --- a/libpod/image/image_test.go +++ b/libpod/image/image_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "github.com/containers/libpod/v2/libpod/events" - "github.com/containers/libpod/v2/pkg/util" + "github.com/containers/podman/v2/libpod/events" + "github.com/containers/podman/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 5ad7a9a5e..8c9267650 100644 --- a/libpod/image/prune.go +++ b/libpod/image/prune.go @@ -5,8 +5,8 @@ import ( "strings" "time" - "github.com/containers/libpod/v2/libpod/events" - "github.com/containers/libpod/v2/pkg/timetype" + "github.com/containers/podman/v2/libpod/events" + "github.com/containers/podman/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 f0cde2012..d31f0dbdc 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/v2/libpod/events" - "github.com/containers/libpod/v2/pkg/registries" + "github.com/containers/podman/v2/libpod/events" + "github.com/containers/podman/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 ee1ff0312..6bcc6d3f8 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/v2/pkg/registries" + sysreg "github.com/containers/podman/v2/pkg/registries" "github.com/pkg/errors" "github.com/sirupsen/logrus" "golang.org/x/sync/semaphore" |