mirror of
https://github.com/containers/podman.git
synced 2025-12-05 21:32:22 +08:00
update c/{buildah,common,image,storage} to latest main
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
15
vendor/github.com/containers/common/pkg/config/config_windows.go
generated
vendored
15
vendor/github.com/containers/common/pkg/config/config_windows.go
generated
vendored
@@ -3,11 +3,12 @@ package config
|
||||
import "os"
|
||||
|
||||
const (
|
||||
// OverrideContainersConfig holds the default config path overridden by the root user
|
||||
OverrideContainersConfig = "/etc/" + _configPath
|
||||
// _configPath is the path to the containers/containers.conf
|
||||
// inside a given config directory.
|
||||
_configPath = "containers\\containers.conf"
|
||||
|
||||
// DefaultContainersConfig holds the default containers config path
|
||||
DefaultContainersConfig = "/usr/share/" + _configPath
|
||||
DefaultContainersConfig = ""
|
||||
|
||||
// DefaultSignaturePolicyPath is the default value for the
|
||||
// policy.json file.
|
||||
@@ -20,7 +21,13 @@ const (
|
||||
// userConfigPath returns the path to the users local config that is
|
||||
// not shared with other users. It uses $APPDATA/containers...
|
||||
func userConfigPath() (string, error) {
|
||||
return os.Getenv("APPDATA") + "\\containers\\containers.conf", nil
|
||||
return os.Getenv("APPDATA") + _configPath, nil
|
||||
}
|
||||
|
||||
// overrideContainersConfigPath returns the path to the system wide
|
||||
// containers config folder. It users $PROGRAMDATA/containers...
|
||||
func overrideContainersConfigPath() (string, error) {
|
||||
return os.Getenv("ProgramData") + _configPath, nil
|
||||
}
|
||||
|
||||
var defaultHelperBinariesDir = []string{
|
||||
|
||||
Reference in New Issue
Block a user