summaryrefslogtreecommitdiff
path: root/cmd/podman/common
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2020-07-06 15:38:20 +0200
committerValentin Rothberg <rothberg@redhat.com>2020-07-06 15:50:12 +0200
commit8489dc43458da43d12ae37bac63753811acf96d9 (patch)
treec2dce0ff4c9f1a00f2f78da106da510c84756866 /cmd/podman/common
parent9bccb0f091a82656593a069891f143e78a8719e9 (diff)
downloadpodman-8489dc43458da43d12ae37bac63753811acf96d9.tar.gz
podman-8489dc43458da43d12ae37bac63753811acf96d9.tar.bz2
podman-8489dc43458da43d12ae37bac63753811acf96d9.zip
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 <rothberg@redhat.com>
Diffstat (limited to 'cmd/podman/common')
-rw-r--r--cmd/podman/common/create.go2
-rw-r--r--cmd/podman/common/create_opts.go2
-rw-r--r--cmd/podman/common/createparse.go2
-rw-r--r--cmd/podman/common/default.go2
-rw-r--r--cmd/podman/common/netflags.go8
-rw-r--r--cmd/podman/common/specgen.go18
-rw-r--r--cmd/podman/common/util.go2
-rw-r--r--cmd/podman/common/volumes.go4
8 files changed, 20 insertions, 20 deletions
diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go
index ec3251ae1..c522bbffb 100644
--- a/cmd/podman/common/create.go
+++ b/cmd/podman/common/create.go
@@ -5,7 +5,7 @@ import (
"os"
"github.com/containers/common/pkg/auth"
- "github.com/containers/libpod/cmd/podman/registry"
+ "github.com/containers/libpod/v2/cmd/podman/registry"
"github.com/spf13/pflag"
)
diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go
index 4f3b8b322..8bce48d8d 100644
--- a/cmd/podman/common/create_opts.go
+++ b/cmd/podman/common/create_opts.go
@@ -1,6 +1,6 @@
package common
-import "github.com/containers/libpod/pkg/domain/entities"
+import "github.com/containers/libpod/v2/pkg/domain/entities"
type ContainerCLIOpts struct {
Annotation []string
diff --git a/cmd/podman/common/createparse.go b/cmd/podman/common/createparse.go
index fe6e322c2..7f10d578e 100644
--- a/cmd/podman/common/createparse.go
+++ b/cmd/podman/common/createparse.go
@@ -1,7 +1,7 @@
package common
import (
- "github.com/containers/libpod/pkg/util"
+ "github.com/containers/libpod/v2/pkg/util"
"github.com/pkg/errors"
)
diff --git a/cmd/podman/common/default.go b/cmd/podman/common/default.go
index 6e5994b18..b4fd2f604 100644
--- a/cmd/podman/common/default.go
+++ b/cmd/podman/common/default.go
@@ -1,7 +1,7 @@
package common
import (
- "github.com/containers/libpod/cmd/podman/registry"
+ "github.com/containers/libpod/v2/cmd/podman/registry"
)
var (
diff --git a/cmd/podman/common/netflags.go b/cmd/podman/common/netflags.go
index 2bb45476b..5c83a3c9c 100644
--- a/cmd/podman/common/netflags.go
+++ b/cmd/podman/common/netflags.go
@@ -3,10 +3,10 @@ package common
import (
"net"
- "github.com/containers/libpod/cmd/podman/parse"
- "github.com/containers/libpod/libpod/define"
- "github.com/containers/libpod/pkg/domain/entities"
- "github.com/containers/libpod/pkg/specgen"
+ "github.com/containers/libpod/v2/cmd/podman/parse"
+ "github.com/containers/libpod/v2/libpod/define"
+ "github.com/containers/libpod/v2/pkg/domain/entities"
+ "github.com/containers/libpod/v2/pkg/specgen"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go
index 1f6fbbe98..c9232654a 100644
--- a/cmd/podman/common/specgen.go
+++ b/cmd/podman/common/specgen.go
@@ -9,15 +9,15 @@ import (
"github.com/containers/common/pkg/config"
"github.com/containers/image/v5/manifest"
- "github.com/containers/libpod/cmd/podman/parse"
- "github.com/containers/libpod/libpod/define"
- ann "github.com/containers/libpod/pkg/annotations"
- envLib "github.com/containers/libpod/pkg/env"
- ns "github.com/containers/libpod/pkg/namespaces"
- "github.com/containers/libpod/pkg/rootless"
- "github.com/containers/libpod/pkg/specgen"
- systemdGen "github.com/containers/libpod/pkg/systemd/generate"
- "github.com/containers/libpod/pkg/util"
+ "github.com/containers/libpod/v2/cmd/podman/parse"
+ "github.com/containers/libpod/v2/libpod/define"
+ ann "github.com/containers/libpod/v2/pkg/annotations"
+ envLib "github.com/containers/libpod/v2/pkg/env"
+ ns "github.com/containers/libpod/v2/pkg/namespaces"
+ "github.com/containers/libpod/v2/pkg/rootless"
+ "github.com/containers/libpod/v2/pkg/specgen"
+ systemdGen "github.com/containers/libpod/v2/pkg/systemd/generate"
+ "github.com/containers/libpod/v2/pkg/util"
"github.com/docker/go-units"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
diff --git a/cmd/podman/common/util.go b/cmd/podman/common/util.go
index 6c8c22147..e21e349d9 100644
--- a/cmd/podman/common/util.go
+++ b/cmd/podman/common/util.go
@@ -6,7 +6,7 @@ import (
"strconv"
"strings"
- "github.com/containers/libpod/pkg/specgen"
+ "github.com/containers/libpod/v2/pkg/specgen"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
diff --git a/cmd/podman/common/volumes.go b/cmd/podman/common/volumes.go
index 63bb8e5f0..b201786f0 100644
--- a/cmd/podman/common/volumes.go
+++ b/cmd/podman/common/volumes.go
@@ -6,8 +6,8 @@ import (
"strings"
"github.com/containers/buildah/pkg/parse"
- "github.com/containers/libpod/pkg/specgen"
- "github.com/containers/libpod/pkg/util"
+ "github.com/containers/libpod/v2/pkg/specgen"
+ "github.com/containers/libpod/v2/pkg/util"
spec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"