Merge pull request #9676 from giuseppe/cli-overrides-conf

options: append CLI graph driver options
containers · Mar 10, 2021 · 1ac2fb7 · 1ac2fb7
2 parents 4d9227d + 6d48997
commit 1ac2fb7
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/libpod/options.go b/libpod/options.go
@@ -64,15 +64,22 @@ func WithStorageConfig(config storage.StoreOptions) RuntimeOption {
 			setField = true
 		}
 
+		graphDriverChanged := false
 		if config.GraphDriverName != "" {
 			rt.storageConfig.GraphDriverName = config.GraphDriverName
 			rt.storageSet.GraphDriverNameSet = true
 			setField = true
+			graphDriverChanged = true
 		}
 
 		if config.GraphDriverOptions != nil {
-			rt.storageConfig.GraphDriverOptions = make([]string, len(config.GraphDriverOptions))
-			copy(rt.storageConfig.GraphDriverOptions, config.GraphDriverOptions)
+			if graphDriverChanged {
+				rt.storageConfig.GraphDriverOptions = make([]string, len(config.GraphDriverOptions))
+				copy(rt.storageConfig.GraphDriverOptions, config.GraphDriverOptions)
+			} else {
+				// append new options after what is specified in the config files
+				rt.storageConfig.GraphDriverOptions = append(rt.storageConfig.GraphDriverOptions, config.GraphDriverOptions...)
+			}
 			setField = true
 		}