From 2d74811520db30cba7246dd1122d484b0c02e5d7 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Mon, 6 Jul 2020 15:52:17 +0200 Subject: move go module to v2 With the advent of Podman 2.0.0 we crossed the magical barrier of go modules. While we were able to continue importing all packages inside of the project, the project could not be vendored anymore from the outside. Move the go module to new major version and change all imports to github.com/containers/libpod/v2. The renaming of the imports was done via gomove [1]. [1] https://github.com/KSubedi/gomove Signed-off-by: Valentin Rothberg --- cmd/podman/registry/config.go | 6 +++--- cmd/podman/registry/registry.go | 8 ++++---- cmd/podman/registry/remote.go | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'cmd/podman/registry') diff --git a/cmd/podman/registry/config.go b/cmd/podman/registry/config.go index a67568d73..85bf5f944 100644 --- a/cmd/podman/registry/config.go +++ b/cmd/podman/registry/config.go @@ -9,9 +9,9 @@ import ( "sync" "github.com/containers/common/pkg/config" - "github.com/containers/libpod/pkg/domain/entities" - "github.com/containers/libpod/pkg/rootless" - "github.com/containers/libpod/pkg/util" + "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/libpod/v2/pkg/rootless" + "github.com/containers/libpod/v2/pkg/util" "github.com/pkg/errors" ) diff --git a/cmd/podman/registry/registry.go b/cmd/podman/registry/registry.go index 71ee2bed0..d93b3e633 100644 --- a/cmd/podman/registry/registry.go +++ b/cmd/podman/registry/registry.go @@ -4,10 +4,10 @@ import ( "context" "path/filepath" - "github.com/containers/libpod/pkg/domain/entities" - "github.com/containers/libpod/pkg/domain/infra" - "github.com/containers/libpod/pkg/rootless" - "github.com/containers/libpod/pkg/util" + "github.com/containers/libpod/v2/pkg/domain/entities" + "github.com/containers/libpod/v2/pkg/domain/infra" + "github.com/containers/libpod/v2/pkg/rootless" + "github.com/containers/libpod/v2/pkg/util" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/podman/registry/remote.go b/cmd/podman/registry/remote.go index 95870750e..3040c4c2a 100644 --- a/cmd/podman/registry/remote.go +++ b/cmd/podman/registry/remote.go @@ -1,7 +1,7 @@ package registry import ( - "github.com/containers/libpod/pkg/domain/entities" + "github.com/containers/libpod/v2/pkg/domain/entities" ) func IsRemote() bool { -- cgit v1.2.3-54-g00ecf