diff options
author | baude <bbaude@redhat.com> | 2018-04-23 13:32:41 -0500 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-04-26 19:14:44 +0000 |
commit | 39a7a773a653176e294382bc6301275fd57aff6b (patch) | |
tree | 334db314ef5681bd6979e2be91dd39640f8e00ff /cmd/podman/utils.go | |
parent | 0ccfd7dc20c11bc2f9d646c98cc67fb399cd9013 (diff) | |
download | podman-39a7a773a653176e294382bc6301275fd57aff6b.tar.gz podman-39a7a773a653176e294382bc6301275fd57aff6b.tar.bz2 podman-39a7a773a653176e294382bc6301275fd57aff6b.zip |
varlink images
implement varlink image functions for working with libpod with the exception of a
couple due to incompletions on the libpod side of things (build).
also, created a first pass at a libpodpy package which will stand as a client to
working with libpod's varlink methods using python.
Signed-off-by: baude <bbaude@redhat.com>
Closes: #669
Approved by: baude
Diffstat (limited to 'cmd/podman/utils.go')
-rw-r--r-- | cmd/podman/utils.go | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/cmd/podman/utils.go b/cmd/podman/utils.go index a74c338cc..254b3d547 100644 --- a/cmd/podman/utils.go +++ b/cmd/podman/utils.go @@ -5,69 +5,15 @@ import ( "os" gosignal "os/signal" - "github.com/containers/storage" "github.com/docker/docker/pkg/signal" "github.com/docker/docker/pkg/term" "github.com/pkg/errors" "github.com/projectatomic/libpod/libpod" "github.com/sirupsen/logrus" - "github.com/urfave/cli" "golang.org/x/crypto/ssh/terminal" "k8s.io/client-go/tools/remotecommand" ) -// Generate a new libpod runtime configured by command line options -func getRuntime(c *cli.Context) (*libpod.Runtime, error) { - options := []libpod.RuntimeOption{} - - if c.GlobalIsSet("root") || c.GlobalIsSet("runroot") || - c.GlobalIsSet("storage-opt") || c.GlobalIsSet("storage-driver") { - storageOpts := storage.DefaultStoreOptions - - if c.GlobalIsSet("root") { - storageOpts.GraphRoot = c.GlobalString("root") - } - if c.GlobalIsSet("runroot") { - storageOpts.RunRoot = c.GlobalString("runroot") - } - if c.GlobalIsSet("storage-driver") { - storageOpts.GraphDriverName = c.GlobalString("storage-driver") - } - if c.GlobalIsSet("storage-opt") { - storageOpts.GraphDriverOptions = c.GlobalStringSlice("storage-opt") - } - - options = append(options, libpod.WithStorageConfig(storageOpts)) - } - - // TODO CLI flags for image config? - // TODO CLI flag for signature policy? - - if c.GlobalIsSet("runtime") { - options = append(options, libpod.WithOCIRuntime(c.GlobalString("runtime"))) - } - - if c.GlobalIsSet("conmon") { - options = append(options, libpod.WithConmonPath(c.GlobalString("conmon"))) - } - - // TODO flag to set CGroup manager? - // TODO flag to set libpod static dir? - // TODO flag to set libpod tmp dir? - - if c.GlobalIsSet("cni-config-dir") { - options = append(options, libpod.WithCNIConfigDir(c.GlobalString("cni-config-dir"))) - } - if c.GlobalIsSet("default-mounts-file") { - options = append(options, libpod.WithDefaultMountsFile(c.GlobalString("default-mounts-file"))) - } - options = append(options, libpod.WithHooksDir(c.GlobalString("hooks-dir-path"))) - - // TODO flag to set CNI plugins dir? - - return libpod.NewRuntime(options...) -} - // Attach to a container func attachCtr(ctr *libpod.Container, stdout, stderr, stdin *os.File, detachKeys string, sigProxy bool) error { resize := make(chan remotecommand.TerminalSize) |