summaryrefslogtreecommitdiff
path: root/pkg/varlinkapi
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2018-08-16 06:41:15 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-08-16 17:12:36 +0000
commitd20f3a51463ce75d139dd830e19a173906b0b0cb (patch)
treec4cb4fe0d68ac052149031c590823b033a92fa80 /pkg/varlinkapi
parentc0abfaa7c38a8fc897a4c1f64392ace40a5a10c1 (diff)
downloadpodman-d20f3a51463ce75d139dd830e19a173906b0b0cb.tar.gz
podman-d20f3a51463ce75d139dd830e19a173906b0b0cb.tar.bz2
podman-d20f3a51463ce75d139dd830e19a173906b0b0cb.zip
switch projectatomic to containers
Need to get some small changes into libpod to pull back into buildah to complete buildah transition. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: #1270 Approved by: mheon
Diffstat (limited to 'pkg/varlinkapi')
-rw-r--r--pkg/varlinkapi/config.go4
-rw-r--r--pkg/varlinkapi/containers.go6
-rw-r--r--pkg/varlinkapi/containers_create.go12
-rw-r--r--pkg/varlinkapi/images.go10
-rw-r--r--pkg/varlinkapi/system.go4
-rw-r--r--pkg/varlinkapi/util.go6
6 files changed, 21 insertions, 21 deletions
diff --git a/pkg/varlinkapi/config.go b/pkg/varlinkapi/config.go
index fa1983463..8dd217b77 100644
--- a/pkg/varlinkapi/config.go
+++ b/pkg/varlinkapi/config.go
@@ -1,8 +1,8 @@
package varlinkapi
import (
- iopodman "github.com/projectatomic/libpod/cmd/podman/varlink"
- "github.com/projectatomic/libpod/libpod"
+ iopodman "github.com/containers/libpod/cmd/podman/varlink"
+ "github.com/containers/libpod/libpod"
"github.com/urfave/cli"
)
diff --git a/pkg/varlinkapi/containers.go b/pkg/varlinkapi/containers.go
index f42386194..df8b66996 100644
--- a/pkg/varlinkapi/containers.go
+++ b/pkg/varlinkapi/containers.go
@@ -9,11 +9,11 @@ import (
"syscall"
"time"
+ "github.com/containers/libpod/cmd/podman/batchcontainer"
+ "github.com/containers/libpod/cmd/podman/varlink"
+ "github.com/containers/libpod/libpod"
"github.com/containers/storage/pkg/archive"
"github.com/pkg/errors"
- "github.com/projectatomic/libpod/cmd/podman/batchcontainer"
- "github.com/projectatomic/libpod/cmd/podman/varlink"
- "github.com/projectatomic/libpod/libpod"
)
// ListContainers ...
diff --git a/pkg/varlinkapi/containers_create.go b/pkg/varlinkapi/containers_create.go
index 5f69a8205..e57f51cc1 100644
--- a/pkg/varlinkapi/containers_create.go
+++ b/pkg/varlinkapi/containers_create.go
@@ -8,14 +8,14 @@ import (
"strings"
"syscall"
+ "github.com/containers/libpod/cmd/podman/varlink"
+ "github.com/containers/libpod/libpod"
+ "github.com/containers/libpod/libpod/image"
+ "github.com/containers/libpod/pkg/inspect"
+ cc "github.com/containers/libpod/pkg/spec"
+ "github.com/containers/libpod/pkg/util"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/pkg/signal"
- "github.com/projectatomic/libpod/cmd/podman/varlink"
- "github.com/projectatomic/libpod/libpod"
- "github.com/projectatomic/libpod/libpod/image"
- "github.com/projectatomic/libpod/pkg/inspect"
- cc "github.com/projectatomic/libpod/pkg/spec"
- "github.com/projectatomic/libpod/pkg/util"
"github.com/sirupsen/logrus"
)
diff --git a/pkg/varlinkapi/images.go b/pkg/varlinkapi/images.go
index ae727d7ad..7953c1fc6 100644
--- a/pkg/varlinkapi/images.go
+++ b/pkg/varlinkapi/images.go
@@ -12,17 +12,17 @@ import (
"github.com/containers/image/docker"
"github.com/containers/image/manifest"
"github.com/containers/image/types"
+ "github.com/containers/libpod/cmd/podman/varlink"
+ "github.com/containers/libpod/libpod"
+ "github.com/containers/libpod/libpod/image"
+ sysreg "github.com/containers/libpod/pkg/registries"
+ "github.com/containers/libpod/pkg/util"
"github.com/docker/go-units"
"github.com/opencontainers/image-spec/specs-go/v1"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
"github.com/projectatomic/buildah"
"github.com/projectatomic/buildah/imagebuildah"
- "github.com/projectatomic/libpod/cmd/podman/varlink"
- "github.com/projectatomic/libpod/libpod"
- "github.com/projectatomic/libpod/libpod/image"
- sysreg "github.com/projectatomic/libpod/pkg/registries"
- "github.com/projectatomic/libpod/pkg/util"
)
// ListImages lists all the images in the store
diff --git a/pkg/varlinkapi/system.go b/pkg/varlinkapi/system.go
index 042aef942..a90b72a6d 100644
--- a/pkg/varlinkapi/system.go
+++ b/pkg/varlinkapi/system.go
@@ -4,8 +4,8 @@ import (
goruntime "runtime"
"strings"
- "github.com/projectatomic/libpod/cmd/podman/varlink"
- "github.com/projectatomic/libpod/libpod"
+ "github.com/containers/libpod/cmd/podman/varlink"
+ "github.com/containers/libpod/libpod"
)
// GetVersion ...
diff --git a/pkg/varlinkapi/util.go b/pkg/varlinkapi/util.go
index 667c09562..b33e43f96 100644
--- a/pkg/varlinkapi/util.go
+++ b/pkg/varlinkapi/util.go
@@ -5,9 +5,9 @@ import (
"strconv"
"time"
- "github.com/projectatomic/libpod/cmd/podman/batchcontainer"
- "github.com/projectatomic/libpod/cmd/podman/varlink"
- "github.com/projectatomic/libpod/libpod"
+ "github.com/containers/libpod/cmd/podman/batchcontainer"
+ "github.com/containers/libpod/cmd/podman/varlink"
+ "github.com/containers/libpod/libpod"
)
// getContext returns a non-nil, empty context