opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-28 05:58:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add --default-mounts-file hidden flag

Browse Source 
The hidden flag is used to override the path of the default mounts file
for testing purposes.
Also modified the secrets pkg to allow for this override to happen.

Signed-off-by: umohnani8 <umohnani@redhat.com>

Closes: #678
Approved by: mheon
This commit is contained in:
umohnani8
2018-04-26 11:29:02 -04:00
committed by Atomic Bot
parent d7d0e13837
commit 6ac8a24db4
7 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/secrets/secrets.go
View File

@ -127,10 +127,15 @@ func getMountsMap(path string) (string, string, error) {
}
// SecretMounts copies, adds, and mounts the secrets to the container root filesystem
func SecretMounts(mountLabel, containerWorkingDir string) []rspec.Mount {
func SecretMounts(mountLabel, containerWorkingDir string, mountFile []string) []rspec.Mount {
var secretMounts []rspec.Mount
// Add secrets from paths given in the mounts.conf files
for _, file := range []string{OverrideMountsFile, DefaultMountsFile} {
// mountFile will have a value if the hidden --default-mounts-file flag is set
// Note for testing purposes only
if len(mountFile) == 0 {
mountFile = append(mountFile, []string{OverrideMountsFile, DefaultMountsFile}...)
}
for _, file := range mountFile {
mounts, err := addSecretsFromMountsFile(file, mountLabel, containerWorkingDir)
if err != nil {
logrus.Warnf("error mounting secrets, skipping: %v", err)