containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

options: append CLI graph driver options
This commit is contained in:
OpenShift Merge Robot 2021-03-10 10:30:49 +01:00 committed by GitHub
parent 4d9227d22c 6d4899745c
commit 1ac2fb7817
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libpod/options.go
View File

@ -64,15 +64,22 @@ func WithStorageConfig(config storage.StoreOptions) RuntimeOption {
setField = true setField = true
} }
graphDriverChanged := false
if config.GraphDriverName != "" { if config.GraphDriverName != "" {
rt.storageConfig.GraphDriverName = config.GraphDriverName rt.storageConfig.GraphDriverName = config.GraphDriverName
rt.storageSet.GraphDriverNameSet = true rt.storageSet.GraphDriverNameSet = true
setField = true setField = true
graphDriverChanged = true
} }
if config.GraphDriverOptions != nil { if config.GraphDriverOptions != nil {
rt.storageConfig.GraphDriverOptions = make([]string, len(config.GraphDriverOptions)) if graphDriverChanged {
copy(rt.storageConfig.GraphDriverOptions, config.GraphDriverOptions) 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 setField = true
} }