diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-08 20:12:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-08 20:12:38 +0100 |
| commit | afd4d5f4a4b05f421e6f336b4d74a0d808be57ed (patch) | |
| tree | 2ccb4a0bd9bda70c1c258dcb1b8aca8961d9ad30 /libpod | |
| parent | 962850c6e0dfcee926af31fc0ad24f1f6c26f8ac (diff) | |
| parent | 25a3923b61a5ca014318e6d957f68abd03947297 (diff) | |
| download | podman-afd4d5f4a4b05f421e6f336b4d74a0d808be57ed.tar.gz podman-afd4d5f4a4b05f421e6f336b4d74a0d808be57ed.tar.bz2 podman-afd4d5f4a4b05f421e6f336b4d74a0d808be57ed.zip | |
Merge pull request #2274 from baude/cobraprep
Migrate to cobra CLI
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/adapter/runtime.go | 4 | ||||
| -rw-r--r-- | libpod/adapter/runtime_remote.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libpod/adapter/runtime.go b/libpod/adapter/runtime.go index 2c408dd2f..46771b5b6 100644 --- a/libpod/adapter/runtime.go +++ b/libpod/adapter/runtime.go @@ -11,11 +11,11 @@ import ( "strconv" "github.com/containers/image/types" + "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/libpodruntime" "github.com/containers/libpod/libpod" "github.com/containers/libpod/libpod/image" "github.com/containers/libpod/pkg/rootless" - "github.com/urfave/cli" ) // LocalRuntime describes a typical libpod runtime @@ -35,7 +35,7 @@ type Container struct { } // GetRuntime returns a LocalRuntime struct with the actual runtime embedded in it -func GetRuntime(c *cli.Context) (*LocalRuntime, error) { +func GetRuntime(c *cliconfig.PodmanCommand) (*LocalRuntime, error) { runtime, err := libpodruntime.GetRuntime(c) if err != nil { return nil, err diff --git a/libpod/adapter/runtime_remote.go b/libpod/adapter/runtime_remote.go index c73e98c95..f754aaee6 100644 --- a/libpod/adapter/runtime_remote.go +++ b/libpod/adapter/runtime_remote.go @@ -14,12 +14,12 @@ import ( "time" "github.com/containers/image/types" + "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/varlink" "github.com/containers/libpod/libpod" "github.com/containers/libpod/libpod/image" "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" - "github.com/urfave/cli" "github.com/varlink/go/varlink" ) @@ -38,7 +38,7 @@ type LocalRuntime struct { } // GetRuntime returns a LocalRuntime struct with the actual runtime embedded in it -func GetRuntime(c *cli.Context) (*LocalRuntime, error) { +func GetRuntime(c *cliconfig.PodmanCommand) (*LocalRuntime, error) { runtime := RemoteRuntime{} conn, err := runtime.Connect() if err != nil { |