mirror of
https://github.com/containers/podman.git
synced 2025-12-19 07:09:39 +08:00
vendor github.com/containers/common@v0.14.3
Includes several fixes for config parsing and AppArmor. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
6
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
6
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
@@ -822,6 +822,7 @@ func stringsEq(a, b []string) bool {
|
||||
|
||||
var (
|
||||
configOnce sync.Once
|
||||
configErr error
|
||||
config *Config
|
||||
)
|
||||
|
||||
@@ -837,11 +838,10 @@ var (
|
||||
// The system defaults container config files can be overwritten using the
|
||||
// CONTAINERS_CONF environment variable. This is usually done for testing.
|
||||
func Default() (*Config, error) {
|
||||
var err error
|
||||
configOnce.Do(func() {
|
||||
config, err = NewConfig("")
|
||||
config, configErr = NewConfig("")
|
||||
})
|
||||
return config, err
|
||||
return config, configErr
|
||||
}
|
||||
|
||||
func Path() string {
|
||||
|
||||
Reference in New Issue
Block a user