opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-04 12:17:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

vendor buildah, image, storage, cni

Browse Source 
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
Valentin Rothberg
2019-03-28 10:30:09 +01:00
parent e7a2eecf5f
commit a5443a532b
79 changed files with 1875 additions and 1110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
vendor/github.com/containers/buildah/pkg/secrets/secrets.go generated vendored
View File

@@ -7,7 +7,6 @@ import (
"path/filepath"
"strings"
"github.com/containers/libpod/pkg/rootless"
"github.com/containers/storage/pkg/idtools"
rspec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/opencontainers/selinux/go-selinux/label"
@@ -133,12 +132,12 @@ func getMountsMap(path string) (string, string, error) {
}
// SecretMounts copies, adds, and mounts the secrets to the container root filesystem
func SecretMounts(mountLabel, containerWorkingDir, mountFile string) []rspec.Mount {
return SecretMountsWithUIDGID(mountLabel, containerWorkingDir, mountFile, containerWorkingDir, 0, 0)
func SecretMounts(mountLabel, containerWorkingDir, mountFile string, rootless bool) []rspec.Mount {
return SecretMountsWithUIDGID(mountLabel, containerWorkingDir, mountFile, containerWorkingDir, 0, 0, rootless)
}
// SecretMountsWithUIDGID specifies the uid/gid of the owner
func SecretMountsWithUIDGID(mountLabel, containerWorkingDir, mountFile, mountPrefix string, uid, gid int) []rspec.Mount {
func SecretMountsWithUIDGID(mountLabel, containerWorkingDir, mountFile, mountPrefix string, uid, gid int, rootless bool) []rspec.Mount {
var (
secretMounts []rspec.Mount
mountFiles []string
@@ -148,17 +147,8 @@ func SecretMountsWithUIDGID(mountLabel, containerWorkingDir, mountFile, mountPre
// Note for testing purposes only
if mountFile == "" {
mountFiles = append(mountFiles, []string{OverrideMountsFile, DefaultMountsFile}...)
if rootless.IsRootless() {
if rootless {
mountFiles = append([]string{UserOverrideMountsFile}, mountFiles...)
_, err := os.Stat(UserOverrideMountsFile)
if err != nil && os.IsNotExist(err) {
os.MkdirAll(filepath.Dir(UserOverrideMountsFile), 0755)
if f, err := os.Create(UserOverrideMountsFile); err != nil {
logrus.Warnf("could not create file %s: %v", UserOverrideMountsFile, err)
} else {
f.Close()
}
}
}
} else {
mountFiles = append(mountFiles, mountFile)