diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-01-28 10:08:48 -0500 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@gmail.com> | 2018-01-29 08:18:05 -0500 |
| commit | aa5798d28fef206e20556a312959dc58bb52f153 (patch) | |
| tree | 0bef825408fe55826379feddfd677372c1fca51a | |
| parent | d4d3f38018a68c97bd9a748ef3ba109c24743574 (diff) | |
| download | podman-aa5798d28fef206e20556a312959dc58bb52f153.tar.gz podman-aa5798d28fef206e20556a312959dc58bb52f153.tar.bz2 podman-aa5798d28fef206e20556a312959dc58bb52f153.zip | |
Honor storage-driver flag
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | cmd/podman/utils.go | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index d71867667..58de2614d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,6 +45,4 @@ jobs: - make integration go: 1.8.x -# Turn off notifications until we have our own channel (After rename) -# notifications: - irc: "chat.freenode.net#podman" +irc: "chat.freenode.net#podman" diff --git a/cmd/podman/utils.go b/cmd/podman/utils.go index a002966c8..4c42c8ff5 100644 --- a/cmd/podman/utils.go +++ b/cmd/podman/utils.go @@ -11,7 +11,7 @@ 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-opt") || c.GlobalIsSet("storage-driver") { storageOpts := storage.DefaultStoreOptions if c.GlobalIsSet("root") { @@ -20,7 +20,9 @@ func getRuntime(c *cli.Context) (*libpod.Runtime, error) { if c.GlobalIsSet("runroot") { storageOpts.RunRoot = c.GlobalString("runroot") } - // TODO add CLI option to set graph driver + if c.GlobalIsSet("storage-driver") { + storageOpts.GraphDriverName = c.GlobalString("storage-driver") + } if c.GlobalIsSet("storage-opt") { storageOpts.GraphDriverOptions = c.GlobalStringSlice("storage-opt") } |