opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-25 02:57:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Modify secrets pkg

Browse Source 
Made a mistake in my earlier patch. I though that if you add an empty string
to an array, the length of the array would still be 0...
Realised this when vendoring the secrets pkg into cri-o.

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

Closes: #685
Approved by: mheon
This commit is contained in:
umohnani8
2018-04-26 16:41:06 -04:00
committed by Atomic Bot
parent 39a7a773a6
commit 51a5cdc636
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libpod/options.go
View File

@ -194,7 +194,10 @@ func WithDefaultMountsFile(mountsFile string) RuntimeOption {
return ErrRuntimeFinalized return ErrRuntimeFinalized
} }
rt.config.DefaultMountsFile = []string{mountsFile} if mountsFile == "" {
return ErrInvalidArg
}
rt.config.DefaultMountsFile = mountsFile
return nil return nil
} }
} }

2
libpod/runtime.go
View File

@ -132,7 +132,7 @@ type RuntimeConfig struct {
// HooksDir Path to the directory containing hooks configuration files // HooksDir Path to the directory containing hooks configuration files
HooksDir string `toml:"hooks_dir"` HooksDir string `toml:"hooks_dir"`
// DefaultMountsFile is the path to the default mounts file for testing purposes only // DefaultMountsFile is the path to the default mounts file for testing purposes only
DefaultMountsFile []string `toml:"-"` DefaultMountsFile string `toml:"-"`
} }
var ( var (

15
pkg/secrets/secrets.go
View File

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