summaryrefslogtreecommitdiff
path: root/cmd/kpod
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2017-11-02 08:25:06 -0500
committerbaude <bbaude@redhat.com>2017-11-03 20:37:33 -0500
commitaa19565d8d86701191bb2bf15fe0ab019da590dc (patch)
treea35e59ba9ab1f1b11754fcde54d4b606271c10b4 /cmd/kpod
parent99ca35f18598f77bcf260f91044116365d8e3c26 (diff)
downloadpodman-aa19565d8d86701191bb2bf15fe0ab019da590dc.tar.gz
podman-aa19565d8d86701191bb2bf15fe0ab019da590dc.tar.bz2
podman-aa19565d8d86701191bb2bf15fe0ab019da590dc.zip
spec.go: Remove cli context as func arg
Remove cli context as a func arg to make unit tests easier. Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'cmd/kpod')
-rw-r--r--cmd/kpod/create.go2
-rw-r--r--cmd/kpod/run.go2
-rw-r--r--cmd/kpod/spec.go3
3 files changed, 3 insertions, 4 deletions
diff --git a/cmd/kpod/create.go b/cmd/kpod/create.go
index 545714c68..caee0c7f0 100644
--- a/cmd/kpod/create.go
+++ b/cmd/kpod/create.go
@@ -170,7 +170,7 @@ func createCmd(c *cli.Context) error {
if err != nil {
return err
}
- options, err := createConfig.GetContainerCreateOptions(c)
+ options, err := createConfig.GetContainerCreateOptions()
if err != nil {
return errors.Wrapf(err, "unable to parse new container options")
}
diff --git a/cmd/kpod/run.go b/cmd/kpod/run.go
index cefa1d2d0..904977940 100644
--- a/cmd/kpod/run.go
+++ b/cmd/kpod/run.go
@@ -63,7 +63,7 @@ func runCmd(c *cli.Context) error {
}
logrus.Debug("imageID is ", imageID)
- options, err := createConfig.GetContainerCreateOptions(c)
+ options, err := createConfig.GetContainerCreateOptions()
if err != nil {
return errors.Wrapf(err, "unable to parse new container options")
}
diff --git a/cmd/kpod/spec.go b/cmd/kpod/spec.go
index d30c0d1a5..b990d8463 100644
--- a/cmd/kpod/spec.go
+++ b/cmd/kpod/spec.go
@@ -11,7 +11,6 @@ import (
"github.com/projectatomic/libpod/libpod"
ann "github.com/projectatomic/libpod/pkg/annotations"
"github.com/sirupsen/logrus"
- "github.com/urfave/cli"
"golang.org/x/sys/unix"
)
@@ -464,7 +463,7 @@ func (c *createConfig) GetTmpfsMounts() []spec.Mount {
return m
}
-func (c *createConfig) GetContainerCreateOptions(cli *cli.Context) ([]libpod.CtrCreateOption, error) {
+func (c *createConfig) GetContainerCreateOptions() ([]libpod.CtrCreateOption, error) {
var options []libpod.CtrCreateOption
// Uncomment after talking to mheon about unimplemented funcs