storage: allow to use a different configuration file #199
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rhatdan
reviewed
Jul 16, 2018
store.go
Outdated
| DefaultStoreOptions.GraphRoot = "/var/lib/containers/storage" | ||
| DefaultStoreOptions.GraphDriverName = "" | ||
|
|
||
| func ReloadConfigurationFile(configFile string, storeOptions *StoreOptions) { |
There was a problem hiding this comment.
Add a comment defining this function.
storage.conf
Outdated
| @@ -25,6 +25,11 @@ additionalimagestores = [ | |||
| # certain container storage drivers. | |||
| size = "" | |||
|
|
|||
| # Path to a FUSE helper to use for mounting the file system instead of mounting it | |||
| # directly. | |||
| #fuse_program = "/usr/bin/fuse-overlayfs" | |||
There was a problem hiding this comment.
Should we call this mount_program rather then fuse. I see no reason to only do this for fuse executables.
#mount_program = "/usr/bin/fuse-overlayfs"
There was a problem hiding this comment.
this was already present in containers/storage. So I've added a new commit to rename the option name everywhere
store.go
Outdated
| @@ -2992,6 +2992,9 @@ type OptionsConfig struct { | |||
|
|
|||
| // Do not create a bind mount on the storage home | |||
| SkipMountHome string `toml:"skip_mount_home"` | |||
|
|
|||
| // Alternative program to use for the mount of the file system | |||
| FuseProgram string `toml:"fuse_program"` | |||
There was a problem hiding this comment.
done, I've renamed Fuse -> Mount everywhere
Move the configuration file parsing to a new function ReloadConfigurationFile so that it is possible to load a different configuration file and override the current settings. This is useful with rootless containers so a configuration file specific to the user can be loaded. Signed-off-by: Giuseppe Scrivano <[email protected]>
giuseppe
force-pushed
the
allow-to-override-conf-file
branch
from
b598b50 to
4ebf4f7
Compare
|
LGTM |
nalind
reviewed
Jul 16, 2018
docs/containers-storage.conf.5.md
Outdated
|
|
||
| Specifies the path to a custom FUSE program to use instead for mounting the file system. | ||
| Specifies the path to a custom program to use instead for mounting the file system. |
There was a problem hiding this comment.
This shouldn't be in the storage.options.thinpool section.
nalind
reviewed
Jul 16, 2018
store.go
Outdated
| storeOptions.GraphDriverOptions = append(storeOptions.GraphDriverOptions, fmt.Sprintf("%s.mount_program=%s", config.Storage.Driver, config.Storage.Options.MountProgram)) | ||
| } | ||
| if config.Storage.Options.OverrideKernelCheck != "" { | ||
| storeOptions.GraphDriverOptions = append(storeOptions.GraphDriverOptions, fmt.Sprintf("%s.override_kernel_check=%s", config.Storage.Driver, config.Storage.Options.OverrideKernelCheck)) | ||
| } |
There was a problem hiding this comment.
This block duplicates the block that follows it.
|
A couple of comments, but mostly fine. |
Signed-off-by: Giuseppe Scrivano <[email protected]>
Signed-off-by: Giuseppe Scrivano <[email protected]>
giuseppe
force-pushed
the
allow-to-override-conf-file
branch
from
4ebf4f7 to
e933db5
Compare
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Move the configuration file parsing to a new function
ReloadConfigurationFileso that it is possible to load a differentconfiguration file and override the current settings. This is useful with rootless containers so a configuration file specific to the user can be loaded.