summaryrefslogtreecommitdiff
path: root/cmd/podman/common
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-07-28 10:12:55 -0400
committerGitHub <noreply@github.com>2020-07-28 10:12:55 -0400
commit288ebec6e737c105fa0ef43412de4e0a8997feb9 (patch)
tree57eb1b59866fd63b7618b885fcbfb1e614709cf4 /cmd/podman/common
parent6ed9868a34a875359852a910c23248946de59d20 (diff)
parenta5e37ad2805b2594339e0d5d41da0e0cc37e4f4a (diff)
downloadpodman-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 'cmd/podman/common')
-rw-r--r--cmd/podman/common/create.go4
-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.go16
-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 e248e621f..e96b6a8d6 100644
--- a/cmd/podman/common/create.go
+++ b/cmd/podman/common/create.go
@@ -5,8 +5,8 @@ import (
"os"
"github.com/containers/common/pkg/auth"
- "github.com/containers/libpod/v2/cmd/podman/registry"
- "github.com/containers/libpod/v2/libpod/define"
+ "github.com/containers/podman/v2/cmd/podman/registry"
+ "github.com/containers/podman/v2/libpod/define"
"github.com/spf13/pflag"
)
diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go
index 2bea8b0b4..3802c37b0 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/v2/pkg/domain/entities"
+import "github.com/containers/podman/v2/pkg/domain/entities"
type ContainerCLIOpts struct {
Annotation []string
diff --git a/cmd/podman/common/createparse.go b/cmd/podman/common/createparse.go
index 7f10d578e..059f9050f 100644
--- a/cmd/podman/common/createparse.go
+++ b/cmd/podman/common/createparse.go
@@ -1,7 +1,7 @@
package common
import (
- "github.com/containers/libpod/v2/pkg/util"
+ "github.com/containers/podman/v2/pkg/util"
"github.com/pkg/errors"
)
diff --git a/cmd/podman/common/default.go b/cmd/podman/common/default.go
index b4fd2f604..af64e7162 100644
--- a/cmd/podman/common/default.go
+++ b/cmd/podman/common/default.go
@@ -1,7 +1,7 @@
package common
import (
- "github.com/containers/libpod/v2/cmd/podman/registry"
+ "github.com/containers/podman/v2/cmd/podman/registry"
)
var (
diff --git a/cmd/podman/common/netflags.go b/cmd/podman/common/netflags.go
index 82a82b310..1b8297c36 100644
--- a/cmd/podman/common/netflags.go
+++ b/cmd/podman/common/netflags.go
@@ -4,10 +4,10 @@ import (
"net"
"strings"
- "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/containers/podman/v2/cmd/podman/parse"
+ "github.com/containers/podman/v2/libpod/define"
+ "github.com/containers/podman/v2/pkg/domain/entities"
+ "github.com/containers/podman/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 e694317cc..07c88efea 100644
--- a/cmd/podman/common/specgen.go
+++ b/cmd/podman/common/specgen.go
@@ -8,14 +8,14 @@ import (
"time"
"github.com/containers/image/v5/manifest"
- "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/specgen"
- systemdGen "github.com/containers/libpod/v2/pkg/systemd/generate"
- "github.com/containers/libpod/v2/pkg/util"
+ "github.com/containers/podman/v2/cmd/podman/parse"
+ "github.com/containers/podman/v2/libpod/define"
+ ann "github.com/containers/podman/v2/pkg/annotations"
+ envLib "github.com/containers/podman/v2/pkg/env"
+ ns "github.com/containers/podman/v2/pkg/namespaces"
+ "github.com/containers/podman/v2/pkg/specgen"
+ systemdGen "github.com/containers/podman/v2/pkg/systemd/generate"
+ "github.com/containers/podman/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 e21e349d9..41432c6f0 100644
--- a/cmd/podman/common/util.go
+++ b/cmd/podman/common/util.go
@@ -6,7 +6,7 @@ import (
"strconv"
"strings"
- "github.com/containers/libpod/v2/pkg/specgen"
+ "github.com/containers/podman/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 47a6f3c35..3b8f7ec6e 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/v2/pkg/specgen"
- "github.com/containers/libpod/v2/pkg/util"
+ "github.com/containers/podman/v2/pkg/specgen"
+ "github.com/containers/podman/v2/pkg/util"
spec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"