summaryrefslogtreecommitdiff
path: root/pkg/varlinkapi
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-07-28 08:23:45 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2020-07-28 08:23:45 -0400
commita5e37ad2805b2594339e0d5d41da0e0cc37e4f4a (patch)
treef1d1fef82a8bddfaf2c7c10f9fd91e1b74499393 /pkg/varlinkapi
parent91c92d10fc64af7e7813ba46f8eae8a8e7db44de (diff)
downloadpodman-a5e37ad2805b2594339e0d5d41da0e0cc37e4f4a.tar.gz
podman-a5e37ad2805b2594339e0d5d41da0e0cc37e4f4a.tar.bz2
podman-a5e37ad2805b2594339e0d5d41da0e0cc37e4f4a.zip
Switch all references to github.com/containers/libpod -> podman
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/varlinkapi')
-rw-r--r--pkg/varlinkapi/attach.go10
-rw-r--r--pkg/varlinkapi/config.go4
-rw-r--r--pkg/varlinkapi/container.go10
-rw-r--r--pkg/varlinkapi/containers.go14
-rw-r--r--pkg/varlinkapi/containers_create.go2
-rw-r--r--pkg/varlinkapi/create.go32
-rw-r--r--pkg/varlinkapi/events.go4
-rw-r--r--pkg/varlinkapi/funcs.go2
-rw-r--r--pkg/varlinkapi/generate.go2
-rw-r--r--pkg/varlinkapi/images.go14
-rw-r--r--pkg/varlinkapi/intermediate_varlink.go4
-rw-r--r--pkg/varlinkapi/mount.go2
-rw-r--r--pkg/varlinkapi/pods.go6
-rw-r--r--pkg/varlinkapi/remote_client.go4
-rw-r--r--pkg/varlinkapi/shortcuts.go2
-rw-r--r--pkg/varlinkapi/system.go4
-rw-r--r--pkg/varlinkapi/transfers.go2
-rw-r--r--pkg/varlinkapi/util.go8
-rw-r--r--pkg/varlinkapi/volumes.go6
19 files changed, 66 insertions, 66 deletions
diff --git a/pkg/varlinkapi/attach.go b/pkg/varlinkapi/attach.go
index 8acf2a1b6..38354a790 100644
--- a/pkg/varlinkapi/attach.go
+++ b/pkg/varlinkapi/attach.go
@@ -7,11 +7,11 @@ import (
"context"
"io"
- "github.com/containers/libpod/v2/libpod"
- "github.com/containers/libpod/v2/libpod/define"
- "github.com/containers/libpod/v2/libpod/events"
- iopodman "github.com/containers/libpod/v2/pkg/varlink"
- "github.com/containers/libpod/v2/pkg/varlinkapi/virtwriter"
+ "github.com/containers/podman/v2/libpod"
+ "github.com/containers/podman/v2/libpod/define"
+ "github.com/containers/podman/v2/libpod/events"
+ iopodman "github.com/containers/podman/v2/pkg/varlink"
+ "github.com/containers/podman/v2/pkg/varlinkapi/virtwriter"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"k8s.io/client-go/tools/remotecommand"
diff --git a/pkg/varlinkapi/config.go b/pkg/varlinkapi/config.go
index cd6342a17..50e6fb833 100644
--- a/pkg/varlinkapi/config.go
+++ b/pkg/varlinkapi/config.go
@@ -3,8 +3,8 @@
package varlinkapi
import (
- "github.com/containers/libpod/v2/libpod"
- iopodman "github.com/containers/libpod/v2/pkg/varlink"
+ "github.com/containers/podman/v2/libpod"
+ iopodman "github.com/containers/podman/v2/pkg/varlink"
"github.com/spf13/cobra"
)
diff --git a/pkg/varlinkapi/container.go b/pkg/varlinkapi/container.go
index d578d9b87..bf3ed0022 100644
--- a/pkg/varlinkapi/container.go
+++ b/pkg/varlinkapi/container.go
@@ -15,11 +15,11 @@ import (
"time"
"github.com/containers/image/v5/types"
- "github.com/containers/libpod/v2/libpod"
- "github.com/containers/libpod/v2/libpod/define"
- "github.com/containers/libpod/v2/libpod/image"
- "github.com/containers/libpod/v2/pkg/timetype"
- "github.com/containers/libpod/v2/pkg/util"
+ "github.com/containers/podman/v2/libpod"
+ "github.com/containers/podman/v2/libpod/define"
+ "github.com/containers/podman/v2/libpod/image"
+ "github.com/containers/podman/v2/pkg/timetype"
+ "github.com/containers/podman/v2/pkg/util"
"github.com/cri-o/ocicni/pkg/ocicni"
"github.com/docker/go-units"
"github.com/google/shlex"
diff --git a/pkg/varlinkapi/containers.go b/pkg/varlinkapi/containers.go
index 07b492331..fef3b6476 100644
--- a/pkg/varlinkapi/containers.go
+++ b/pkg/varlinkapi/containers.go
@@ -14,13 +14,13 @@ import (
"syscall"
"time"
- "github.com/containers/libpod/v2/libpod"
- "github.com/containers/libpod/v2/libpod/define"
- "github.com/containers/libpod/v2/libpod/logs"
- "github.com/containers/libpod/v2/pkg/cgroups"
- "github.com/containers/libpod/v2/pkg/rootless"
- iopodman "github.com/containers/libpod/v2/pkg/varlink"
- "github.com/containers/libpod/v2/pkg/varlinkapi/virtwriter"
+ "github.com/containers/podman/v2/libpod"
+ "github.com/containers/podman/v2/libpod/define"
+ "github.com/containers/podman/v2/libpod/logs"
+ "github.com/containers/podman/v2/pkg/cgroups"
+ "github.com/containers/podman/v2/pkg/rootless"
+ iopodman "github.com/containers/podman/v2/pkg/varlink"
+ "github.com/containers/podman/v2/pkg/varlinkapi/virtwriter"
"github.com/containers/storage/pkg/archive"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
diff --git a/pkg/varlinkapi/containers_create.go b/pkg/varlinkapi/containers_create.go
index 2fdcfedca..771e58089 100644
--- a/pkg/varlinkapi/containers_create.go
+++ b/pkg/varlinkapi/containers_create.go
@@ -3,7 +3,7 @@
package varlinkapi
import (
- iopodman "github.com/containers/libpod/v2/pkg/varlink"
+ iopodman "github.com/containers/podman/v2/pkg/varlink"
)
// CreateContainer ...
diff --git a/pkg/varlinkapi/create.go b/pkg/varlinkapi/create.go
index ac93939d9..2d3e20f67 100644
--- a/pkg/varlinkapi/create.go
+++ b/pkg/varlinkapi/create.go
@@ -15,22 +15,22 @@ import (
"github.com/containers/common/pkg/sysinfo"
"github.com/containers/image/v5/manifest"
- "github.com/containers/libpod/v2/cmd/podman/parse"
- "github.com/containers/libpod/v2/libpod"
- "github.com/containers/libpod/v2/libpod/define"
- "github.com/containers/libpod/v2/libpod/image"
- ann "github.com/containers/libpod/v2/pkg/annotations"
- "github.com/containers/libpod/v2/pkg/autoupdate"
- "github.com/containers/libpod/v2/pkg/cgroups"
- envLib "github.com/containers/libpod/v2/pkg/env"
- "github.com/containers/libpod/v2/pkg/errorhandling"
- "github.com/containers/libpod/v2/pkg/inspect"
- ns "github.com/containers/libpod/v2/pkg/namespaces"
- "github.com/containers/libpod/v2/pkg/rootless"
- "github.com/containers/libpod/v2/pkg/seccomp"
- cc "github.com/containers/libpod/v2/pkg/spec"
- 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"
+ "github.com/containers/podman/v2/libpod/define"
+ "github.com/containers/podman/v2/libpod/image"
+ ann "github.com/containers/podman/v2/pkg/annotations"
+ "github.com/containers/podman/v2/pkg/autoupdate"
+ "github.com/containers/podman/v2/pkg/cgroups"
+ envLib "github.com/containers/podman/v2/pkg/env"
+ "github.com/containers/podman/v2/pkg/errorhandling"
+ "github.com/containers/podman/v2/pkg/inspect"
+ ns "github.com/containers/podman/v2/pkg/namespaces"
+ "github.com/containers/podman/v2/pkg/rootless"
+ "github.com/containers/podman/v2/pkg/seccomp"
+ cc "github.com/containers/podman/v2/pkg/spec"
+ systemdGen "github.com/containers/podman/v2/pkg/systemd/generate"
+ "github.com/containers/podman/v2/pkg/util"
"github.com/docker/go-connections/nat"
"github.com/docker/go-units"
"github.com/opentracing/opentracing-go"
diff --git a/pkg/varlinkapi/events.go b/pkg/varlinkapi/events.go
index 910b64a57..8628b1ce6 100644
--- a/pkg/varlinkapi/events.go
+++ b/pkg/varlinkapi/events.go
@@ -6,8 +6,8 @@ import (
"context"
"time"
- "github.com/containers/libpod/v2/libpod/events"
- iopodman "github.com/containers/libpod/v2/pkg/varlink"
+ "github.com/containers/podman/v2/libpod/events"
+ iopodman "github.com/containers/podman/v2/pkg/varlink"
)
// GetEvents is a remote endpoint to get events from the event log
diff --git a/pkg/varlinkapi/funcs.go b/pkg/varlinkapi/funcs.go
index e32e311b0..8fb8a7ea0 100644
--- a/pkg/varlinkapi/funcs.go
+++ b/pkg/varlinkapi/funcs.go
@@ -7,7 +7,7 @@ import (
"strings"
"github.com/containers/image/v5/types"
- "github.com/containers/libpod/v2/libpod/image"
+ "github.com/containers/podman/v2/libpod/image"
"github.com/google/shlex"
"github.com/pkg/errors"
)
diff --git a/pkg/varlinkapi/generate.go b/pkg/varlinkapi/generate.go
index 7c481aad7..bbc16dae5 100644
--- a/pkg/varlinkapi/generate.go
+++ b/pkg/varlinkapi/generate.go
@@ -5,7 +5,7 @@ package varlinkapi
import (
"encoding/json"
- iopodman "github.com/containers/libpod/v2/pkg/varlink"
+ iopodman "github.com/containers/podman/v2/pkg/varlink"
)
// GenerateKube ...
diff --git a/pkg/varlinkapi/images.go b/pkg/varlinkapi/images.go
index 8d67a47bc..1dcfa2213 100644
--- a/pkg/varlinkapi/images.go
+++ b/pkg/varlinkapi/images.go
@@ -20,13 +20,13 @@ import (
"github.com/containers/image/v5/manifest"
"github.com/containers/image/v5/transports/alltransports"
"github.com/containers/image/v5/types"
- "github.com/containers/libpod/v2/libpod"
- "github.com/containers/libpod/v2/libpod/define"
- "github.com/containers/libpod/v2/libpod/image"
- "github.com/containers/libpod/v2/pkg/channelwriter"
- "github.com/containers/libpod/v2/pkg/util"
- iopodman "github.com/containers/libpod/v2/pkg/varlink"
- "github.com/containers/libpod/v2/utils"
+ "github.com/containers/podman/v2/libpod"
+ "github.com/containers/podman/v2/libpod/define"
+ "github.com/containers/podman/v2/libpod/image"
+ "github.com/containers/podman/v2/pkg/channelwriter"
+ "github.com/containers/podman/v2/pkg/util"
+ iopodman "github.com/containers/podman/v2/pkg/varlink"
+ "github.com/containers/podman/v2/utils"
"github.com/containers/storage/pkg/archive"
v1 "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors"
diff --git a/pkg/varlinkapi/intermediate_varlink.go b/pkg/varlinkapi/intermediate_varlink.go
index f1a183017..0d74f1a95 100644
--- a/pkg/varlinkapi/intermediate_varlink.go
+++ b/pkg/varlinkapi/intermediate_varlink.go
@@ -4,8 +4,8 @@ package varlinkapi
import (
"github.com/containers/common/pkg/config"
- "github.com/containers/libpod/v2/pkg/rootless"
- iopodman "github.com/containers/libpod/v2/pkg/varlink"
+ "github.com/containers/podman/v2/pkg/rootless"
+ iopodman "github.com/containers/podman/v2/pkg/varlink"
"github.com/pkg/errors"
)
diff --git a/pkg/varlinkapi/mount.go b/pkg/varlinkapi/mount.go
index a04a0b630..6fd4de709 100644
--- a/pkg/varlinkapi/mount.go
+++ b/pkg/varlinkapi/mount.go
@@ -2,7 +2,7 @@
package varlinkapi
-import iopodman "github.com/containers/libpod/v2/pkg/varlink"
+import iopodman "github.com/containers/podman/v2/pkg/varlink"
// ListContainerMounts ...
func (i *VarlinkAPI) ListContainerMounts(call iopodman.VarlinkCall) error {
diff --git a/pkg/varlinkapi/pods.go b/pkg/varlinkapi/pods.go
index b190233d5..189434780 100644
--- a/pkg/varlinkapi/pods.go
+++ b/pkg/varlinkapi/pods.go
@@ -8,9 +8,9 @@ import (
"strconv"
"syscall"
- "github.com/containers/libpod/v2/libpod"
- "github.com/containers/libpod/v2/libpod/define"
- iopodman "github.com/containers/libpod/v2/pkg/varlink"
+ "github.com/containers/podman/v2/libpod"
+ "github.com/containers/podman/v2/libpod/define"
+ iopodman "github.com/containers/podman/v2/pkg/varlink"
"github.com/cri-o/ocicni/pkg/ocicni"
"github.com/docker/go-connections/nat"
"github.com/pkg/errors"
diff --git a/pkg/varlinkapi/remote_client.go b/pkg/varlinkapi/remote_client.go
index 0ad2d89cc..88c11c126 100644
--- a/pkg/varlinkapi/remote_client.go
+++ b/pkg/varlinkapi/remote_client.go
@@ -3,8 +3,8 @@
package varlinkapi
import (
- "github.com/containers/libpod/v2/libpod/define"
- iopodman "github.com/containers/libpod/v2/pkg/varlink"
+ "github.com/containers/podman/v2/libpod/define"
+ iopodman "github.com/containers/podman/v2/pkg/varlink"
)
// ContainerStatsToLibpodContainerStats converts the varlink containerstats to a libpod
diff --git a/pkg/varlinkapi/shortcuts.go b/pkg/varlinkapi/shortcuts.go
index 8e21cc5d0..bfb05c0e3 100644
--- a/pkg/varlinkapi/shortcuts.go
+++ b/pkg/varlinkapi/shortcuts.go
@@ -1,7 +1,7 @@
package varlinkapi
import (
- "github.com/containers/libpod/v2/libpod"
+ "github.com/containers/podman/v2/libpod"
"github.com/sirupsen/logrus"
)
diff --git a/pkg/varlinkapi/system.go b/pkg/varlinkapi/system.go
index b5fe681fd..9e4db2611 100644
--- a/pkg/varlinkapi/system.go
+++ b/pkg/varlinkapi/system.go
@@ -10,8 +10,8 @@ import (
"time"
"github.com/containers/image/v5/pkg/sysregistriesv2"
- "github.com/containers/libpod/v2/libpod/define"
- iopodman "github.com/containers/libpod/v2/pkg/varlink"
+ "github.com/containers/podman/v2/libpod/define"
+ iopodman "github.com/containers/podman/v2/pkg/varlink"
"github.com/sirupsen/logrus"
)
diff --git a/pkg/varlinkapi/transfers.go b/pkg/varlinkapi/transfers.go
index 32c227d56..a4550a417 100644
--- a/pkg/varlinkapi/transfers.go
+++ b/pkg/varlinkapi/transfers.go
@@ -8,7 +8,7 @@ import (
"io/ioutil"
"os"
- iopodman "github.com/containers/libpod/v2/pkg/varlink"
+ iopodman "github.com/containers/podman/v2/pkg/varlink"
"github.com/sirupsen/logrus"
)
diff --git a/pkg/varlinkapi/util.go b/pkg/varlinkapi/util.go
index 64b61c6fd..748d8f9cc 100644
--- a/pkg/varlinkapi/util.go
+++ b/pkg/varlinkapi/util.go
@@ -9,10 +9,10 @@ import (
"time"
"github.com/containers/buildah"
- "github.com/containers/libpod/v2/libpod"
- "github.com/containers/libpod/v2/libpod/define"
- "github.com/containers/libpod/v2/pkg/channelwriter"
- iopodman "github.com/containers/libpod/v2/pkg/varlink"
+ "github.com/containers/podman/v2/libpod"
+ "github.com/containers/podman/v2/libpod/define"
+ "github.com/containers/podman/v2/pkg/channelwriter"
+ iopodman "github.com/containers/podman/v2/pkg/varlink"
"github.com/containers/storage/pkg/archive"
)
diff --git a/pkg/varlinkapi/volumes.go b/pkg/varlinkapi/volumes.go
index a1e711d34..7cc714ea4 100644
--- a/pkg/varlinkapi/volumes.go
+++ b/pkg/varlinkapi/volumes.go
@@ -6,9 +6,9 @@ import (
"context"
"encoding/json"
- "github.com/containers/libpod/v2/libpod"
- "github.com/containers/libpod/v2/pkg/domain/infra/abi/parse"
- iopodman "github.com/containers/libpod/v2/pkg/varlink"
+ "github.com/containers/podman/v2/libpod"
+ "github.com/containers/podman/v2/pkg/domain/infra/abi/parse"
+ iopodman "github.com/containers/podman/v2/pkg/varlink"
)
// VolumeCreate creates a libpod volume based on input from a varlink connection