aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'cmd')
-rw-r--r--cmd/kpod/common.go11
-rw-r--r--cmd/kpod/diff.go2
-rw-r--r--cmd/kpod/history.go2
-rw-r--r--cmd/kpod/images.go6
-rw-r--r--cmd/kpod/info.go2
-rw-r--r--cmd/kpod/inspect.go6
-rw-r--r--cmd/kpod/kill.go2
-rw-r--r--cmd/kpod/load.go2
-rw-r--r--cmd/kpod/login.go2
-rw-r--r--cmd/kpod/logout.go2
-rw-r--r--cmd/kpod/logs.go2
-rw-r--r--cmd/kpod/mount.go2
-rw-r--r--cmd/kpod/pause.go2
-rw-r--r--cmd/kpod/ps.go6
-rw-r--r--cmd/kpod/pull.go4
-rw-r--r--cmd/kpod/push.go4
-rw-r--r--cmd/kpod/rename.go2
-rw-r--r--cmd/kpod/rm.go2
-rw-r--r--cmd/kpod/save.go2
-rw-r--r--cmd/kpod/stats.go4
-rw-r--r--cmd/kpod/stop.go2
-rw-r--r--cmd/kpod/tag.go2
-rw-r--r--cmd/kpod/unpause.go2
-rw-r--r--cmd/kpod/wait.go2
24 files changed, 38 insertions, 37 deletions
diff --git a/cmd/kpod/common.go b/cmd/kpod/common.go
index f77b3fd1e..338aee8ea 100644
--- a/cmd/kpod/common.go
+++ b/cmd/kpod/common.go
@@ -9,9 +9,8 @@ import (
is "github.com/containers/image/storage"
"github.com/containers/storage"
"github.com/fatih/camelcase"
- "github.com/kubernetes-incubator/cri-o/libkpod"
- "github.com/kubernetes-incubator/cri-o/libpod"
- "github.com/kubernetes-incubator/cri-o/server"
+ "github.com/projectatomic/libpod/libkpod"
+ "github.com/projectatomic/libpod/libpod"
"github.com/pkg/errors"
"github.com/urfave/cli"
)
@@ -20,6 +19,8 @@ var (
stores = make(map[storage.Store]struct{})
)
+const CrioConfigPath = "/etc/crio/crio.conf"
+
func getStore(c *libkpod.Config) (storage.Store, error) {
options := storage.DefaultStoreOptions
options.GraphRoot = c.Root
@@ -65,8 +66,8 @@ func getConfig(c *cli.Context) (*libkpod.Config, error) {
var configFile string
if c.GlobalIsSet("config") {
configFile = c.GlobalString("config")
- } else if _, err := os.Stat(server.CrioConfigPath); err == nil {
- configFile = server.CrioConfigPath
+ } else if _, err := os.Stat(CrioConfigPath); err == nil {
+ configFile = CrioConfigPath
}
// load and merge the configfile from the commandline or use
// the default crio config file
diff --git a/cmd/kpod/diff.go b/cmd/kpod/diff.go
index c28bdfce6..fc2dc8ef8 100644
--- a/cmd/kpod/diff.go
+++ b/cmd/kpod/diff.go
@@ -4,7 +4,7 @@ import (
"fmt"
"github.com/containers/storage/pkg/archive"
- "github.com/kubernetes-incubator/cri-o/cmd/kpod/formats"
+ "github.com/projectatomic/libpod/cmd/kpod/formats"
"github.com/pkg/errors"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/history.go b/cmd/kpod/history.go
index dd0da38a6..ea91904ad 100644
--- a/cmd/kpod/history.go
+++ b/cmd/kpod/history.go
@@ -8,7 +8,7 @@ import (
"github.com/containers/image/types"
units "github.com/docker/go-units"
- "github.com/kubernetes-incubator/cri-o/cmd/kpod/formats"
+ "github.com/projectatomic/libpod/cmd/kpod/formats"
"github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors"
"github.com/urfave/cli"
diff --git a/cmd/kpod/images.go b/cmd/kpod/images.go
index d7824ba3f..36727a897 100644
--- a/cmd/kpod/images.go
+++ b/cmd/kpod/images.go
@@ -9,9 +9,9 @@ import (
"github.com/containers/image/types"
"github.com/containers/storage"
"github.com/docker/go-units"
- "github.com/kubernetes-incubator/cri-o/cmd/kpod/formats"
- "github.com/kubernetes-incubator/cri-o/libpod"
- "github.com/kubernetes-incubator/cri-o/libpod/common"
+ "github.com/projectatomic/libpod/cmd/kpod/formats"
+ "github.com/projectatomic/libpod/libpod"
+ "github.com/projectatomic/libpod/libpod/common"
digest "github.com/opencontainers/go-digest"
"github.com/pkg/errors"
"github.com/urfave/cli"
diff --git a/cmd/kpod/info.go b/cmd/kpod/info.go
index 22ca74c73..3c634ac9c 100644
--- a/cmd/kpod/info.go
+++ b/cmd/kpod/info.go
@@ -8,7 +8,7 @@ import (
"runtime"
"github.com/docker/docker/pkg/system"
- "github.com/kubernetes-incubator/cri-o/cmd/kpod/formats"
+ "github.com/projectatomic/libpod/cmd/kpod/formats"
"github.com/pkg/errors"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/inspect.go b/cmd/kpod/inspect.go
index 45e9d7e18..78439ed89 100644
--- a/cmd/kpod/inspect.go
+++ b/cmd/kpod/inspect.go
@@ -1,9 +1,9 @@
package main
import (
- "github.com/kubernetes-incubator/cri-o/cmd/kpod/formats"
- "github.com/kubernetes-incubator/cri-o/libkpod"
- "github.com/kubernetes-incubator/cri-o/libpod/images"
+ "github.com/projectatomic/libpod/cmd/kpod/formats"
+ "github.com/projectatomic/libpod/libkpod"
+ "github.com/projectatomic/libpod/libpod/images"
"github.com/pkg/errors"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/kill.go b/cmd/kpod/kill.go
index 8a5500031..686305781 100644
--- a/cmd/kpod/kill.go
+++ b/cmd/kpod/kill.go
@@ -5,7 +5,7 @@ import (
"os"
"github.com/docker/docker/pkg/signal"
- "github.com/kubernetes-incubator/cri-o/libkpod"
+ "github.com/projectatomic/libpod/libkpod"
"github.com/pkg/errors"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/load.go b/cmd/kpod/load.go
index b1cff1e88..392ce08ac 100644
--- a/cmd/kpod/load.go
+++ b/cmd/kpod/load.go
@@ -5,7 +5,7 @@ import (
"io/ioutil"
"os"
- "github.com/kubernetes-incubator/cri-o/libpod"
+ "github.com/projectatomic/libpod/libpod"
"github.com/pkg/errors"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/login.go b/cmd/kpod/login.go
index 17880f7a7..956de6d14 100644
--- a/cmd/kpod/login.go
+++ b/cmd/kpod/login.go
@@ -9,7 +9,7 @@ import (
"github.com/containers/image/docker"
"github.com/containers/image/pkg/docker/config"
- "github.com/kubernetes-incubator/cri-o/libpod/common"
+ "github.com/projectatomic/libpod/libpod/common"
"github.com/pkg/errors"
"github.com/urfave/cli"
"golang.org/x/crypto/ssh/terminal"
diff --git a/cmd/kpod/logout.go b/cmd/kpod/logout.go
index 587346151..0b07f1a63 100644
--- a/cmd/kpod/logout.go
+++ b/cmd/kpod/logout.go
@@ -4,7 +4,7 @@ import (
"fmt"
"github.com/containers/image/pkg/docker/config"
- "github.com/kubernetes-incubator/cri-o/libpod/common"
+ "github.com/projectatomic/libpod/libpod/common"
"github.com/pkg/errors"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/logs.go b/cmd/kpod/logs.go
index 60be4792e..23c78688d 100644
--- a/cmd/kpod/logs.go
+++ b/cmd/kpod/logs.go
@@ -4,7 +4,7 @@ import (
"fmt"
"time"
- "github.com/kubernetes-incubator/cri-o/libkpod"
+ "github.com/projectatomic/libpod/libkpod"
"github.com/pkg/errors"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/mount.go b/cmd/kpod/mount.go
index a711bedea..4a68621ac 100644
--- a/cmd/kpod/mount.go
+++ b/cmd/kpod/mount.go
@@ -4,7 +4,7 @@ import (
js "encoding/json"
"fmt"
- of "github.com/kubernetes-incubator/cri-o/cmd/kpod/formats"
+ of "github.com/projectatomic/libpod/cmd/kpod/formats"
"github.com/pkg/errors"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/pause.go b/cmd/kpod/pause.go
index 5a8229ebe..510aba424 100644
--- a/cmd/kpod/pause.go
+++ b/cmd/kpod/pause.go
@@ -2,7 +2,7 @@ package main
import (
"fmt"
- "github.com/kubernetes-incubator/cri-o/libkpod"
+ "github.com/projectatomic/libpod/libkpod"
"github.com/pkg/errors"
"github.com/urfave/cli"
"os"
diff --git a/cmd/kpod/ps.go b/cmd/kpod/ps.go
index 76bc8b8b4..2e981bfaa 100644
--- a/cmd/kpod/ps.go
+++ b/cmd/kpod/ps.go
@@ -15,9 +15,9 @@ import (
"k8s.io/apimachinery/pkg/fields"
- "github.com/kubernetes-incubator/cri-o/cmd/kpod/formats"
- "github.com/kubernetes-incubator/cri-o/libkpod"
- "github.com/kubernetes-incubator/cri-o/oci"
+ "github.com/projectatomic/libpod/cmd/kpod/formats"
+ "github.com/projectatomic/libpod/libkpod"
+ "github.com/projectatomic/libpod/oci"
"github.com/pkg/errors"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/pull.go b/cmd/kpod/pull.go
index 738221279..662bb2faa 100644
--- a/cmd/kpod/pull.go
+++ b/cmd/kpod/pull.go
@@ -8,8 +8,8 @@ import (
"golang.org/x/crypto/ssh/terminal"
"github.com/containers/image/types"
- "github.com/kubernetes-incubator/cri-o/libpod"
- "github.com/kubernetes-incubator/cri-o/libpod/common"
+ "github.com/projectatomic/libpod/libpod"
+ "github.com/projectatomic/libpod/libpod/common"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
diff --git a/cmd/kpod/push.go b/cmd/kpod/push.go
index 506d97f4a..518c1d8dc 100644
--- a/cmd/kpod/push.go
+++ b/cmd/kpod/push.go
@@ -7,8 +7,8 @@ import (
"github.com/containers/image/types"
"github.com/containers/storage/pkg/archive"
- "github.com/kubernetes-incubator/cri-o/libpod"
- "github.com/kubernetes-incubator/cri-o/libpod/common"
+ "github.com/projectatomic/libpod/libpod"
+ "github.com/projectatomic/libpod/libpod/common"
"github.com/pkg/errors"
"github.com/urfave/cli"
"golang.org/x/crypto/ssh/terminal"
diff --git a/cmd/kpod/rename.go b/cmd/kpod/rename.go
index b638856ed..68b9a6108 100644
--- a/cmd/kpod/rename.go
+++ b/cmd/kpod/rename.go
@@ -1,7 +1,7 @@
package main
import (
- "github.com/kubernetes-incubator/cri-o/libkpod"
+ "github.com/projectatomic/libpod/libkpod"
"github.com/pkg/errors"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/rm.go b/cmd/kpod/rm.go
index c40fa41c8..8f51befc9 100644
--- a/cmd/kpod/rm.go
+++ b/cmd/kpod/rm.go
@@ -3,7 +3,7 @@ package main
import (
"fmt"
- "github.com/kubernetes-incubator/cri-o/libkpod"
+ "github.com/projectatomic/libpod/libkpod"
"github.com/pkg/errors"
"github.com/urfave/cli"
"golang.org/x/net/context"
diff --git a/cmd/kpod/save.go b/cmd/kpod/save.go
index cfe90a95e..55998fe4d 100644
--- a/cmd/kpod/save.go
+++ b/cmd/kpod/save.go
@@ -4,7 +4,7 @@ import (
"io"
"os"
- "github.com/kubernetes-incubator/cri-o/libpod"
+ "github.com/projectatomic/libpod/libpod"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
diff --git a/cmd/kpod/stats.go b/cmd/kpod/stats.go
index ac81212a1..8548354a9 100644
--- a/cmd/kpod/stats.go
+++ b/cmd/kpod/stats.go
@@ -11,8 +11,8 @@ import (
"github.com/docker/go-units"
tm "github.com/buger/goterm"
- "github.com/kubernetes-incubator/cri-o/libkpod"
- "github.com/kubernetes-incubator/cri-o/oci"
+ "github.com/projectatomic/libpod/libkpod"
+ "github.com/projectatomic/libpod/oci"
"github.com/pkg/errors"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/stop.go b/cmd/kpod/stop.go
index 279f7b762..68e4be472 100644
--- a/cmd/kpod/stop.go
+++ b/cmd/kpod/stop.go
@@ -4,7 +4,7 @@ import (
"fmt"
"os"
- "github.com/kubernetes-incubator/cri-o/libkpod"
+ "github.com/projectatomic/libpod/libkpod"
"github.com/pkg/errors"
"github.com/urfave/cli"
"golang.org/x/net/context"
diff --git a/cmd/kpod/tag.go b/cmd/kpod/tag.go
index b9c380607..b5853ec14 100644
--- a/cmd/kpod/tag.go
+++ b/cmd/kpod/tag.go
@@ -3,7 +3,7 @@ package main
import (
"github.com/containers/image/docker/reference"
"github.com/containers/storage"
- "github.com/kubernetes-incubator/cri-o/libpod"
+ "github.com/projectatomic/libpod/libpod"
"github.com/pkg/errors"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/unpause.go b/cmd/kpod/unpause.go
index a7b7db20f..a17e70753 100644
--- a/cmd/kpod/unpause.go
+++ b/cmd/kpod/unpause.go
@@ -2,7 +2,7 @@ package main
import (
"fmt"
- "github.com/kubernetes-incubator/cri-o/libkpod"
+ "github.com/projectatomic/libpod/libkpod"
"github.com/pkg/errors"
"github.com/urfave/cli"
"os"
diff --git a/cmd/kpod/wait.go b/cmd/kpod/wait.go
index b166e3306..7557bea49 100644
--- a/cmd/kpod/wait.go
+++ b/cmd/kpod/wait.go
@@ -4,7 +4,7 @@ import (
"fmt"
"os"
- "github.com/kubernetes-incubator/cri-o/libkpod"
+ "github.com/projectatomic/libpod/libkpod"
"github.com/pkg/errors"
"github.com/urfave/cli"
)
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 14:07:53 +0000