Merge pull request containers#3240 from rhatdan/storageopts

When you change the storage driver we ignore the storage-options
edsantiago · Jun 10, 2019 · c93b8d6 · c93b8d6
2 parents a89d013 + 629017b
commit c93b8d6
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/cmd/podman/libpodruntime/runtime.go b/cmd/podman/libpodruntime/runtime.go
@@ -67,7 +67,10 @@ func getRuntime(ctx context.Context, c *cliconfig.PodmanCommand, renumber bool,
 	if c.Flags().Changed("storage-driver") {
 		storageSet = true
 		storageOpts.GraphDriverName = c.GlobalFlags.StorageDriver
+		// Overriding the default storage driver caused GraphDriverOptions from storage.conf to be ignored
+		storageOpts.GraphDriverOptions = []string{}
 	}
+	// This should always be checked after storage-driver is checked
 	if len(c.GlobalFlags.StorageOpts) > 0 {
 		storageSet = true
 		storageOpts.GraphDriverOptions = c.GlobalFlags.StorageOpts

diff --git a/libpod/container_internal.go b/libpod/container_internal.go
@@ -360,7 +360,8 @@ func (c *Container) setupStorage(ctx context.Context) error {
 			}
 			return false
 		}
-		defOptions, err := storage.GetDefaultMountOptions()
+
+		defOptions, err := storage.GetMountOptions(c.runtime.store.GraphDriverName(), c.runtime.store.GraphOptions())
 		if err != nil {
 			return errors.Wrapf(err, "error getting default mount options")
 		}

diff --git a/vendor.conf b/vendor.conf
@@ -19,7 +19,7 @@ github.com/containers/image 2c0349c99af7d90694b3faa0e9bde404d407b145
 github.com/vbauerster/mpb v3.3.4
 github.com/mattn/go-isatty v0.0.4
 github.com/VividCortex/ewma v1.1.1
-github.com/containers/storage 9b10041d7b2ef767ce9c42b5862b6c51eeb82214
+github.com/containers/storage v1.12.10
 github.com/containers/psgo v1.3.0
 github.com/coreos/go-systemd v17
 github.com/coreos/pkg v4

diff --git a/vendor/github.com/containers/storage/store.go b/vendor/github.com/containers/storage/store.go
diff --git a/vendor/github.com/containers/storage/utils.go b/vendor/github.com/containers/storage/utils.go