mirror of
https://github.com/containers/podman.git
synced 2025-11-03 07:47:19 +08:00
bump c/common to v0.44.0
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
24
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
24
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
@ -167,7 +167,7 @@ type ContainersConfig struct {
|
||||
|
||||
// RootlessNetworking depicts the "kind" of networking for rootless
|
||||
// containers. Valid options are `slirp4netns` and `cni`. Default is
|
||||
// `slirp4netns`
|
||||
// `slirp4netns` on Linux, and `cni` on non-Linux OSes.
|
||||
RootlessNetworking string `toml:"rootless_networking,omitempty"`
|
||||
|
||||
// SeccompProfile is the seccomp.json profile path which is used as the
|
||||
@ -234,6 +234,10 @@ type EngineConfig struct {
|
||||
// EventsLogger determines where events should be logged.
|
||||
EventsLogger string `toml:"events_logger,omitempty"`
|
||||
|
||||
// HelperBinariesDir is a list of directories which are used to search for
|
||||
// helper binaries.
|
||||
HelperBinariesDir []string `toml:"helper_binaries_dir"`
|
||||
|
||||
// configuration files. When the same filename is present in in
|
||||
// multiple directories, the file in the directory listed last in
|
||||
// this slice takes precedence.
|
||||
@ -1126,3 +1130,21 @@ func (c *Config) ActiveDestination() (uri, identity string, err error) {
|
||||
}
|
||||
return "", "", errors.New("no service destination configured")
|
||||
}
|
||||
|
||||
// FindHelperBinary will search the given binary name in the configured directories.
|
||||
// If searchPATH is set to true it will also search in $PATH.
|
||||
func (c *Config) FindHelperBinary(name string, searchPATH bool) (string, error) {
|
||||
for _, path := range c.Engine.HelperBinariesDir {
|
||||
fullpath := filepath.Join(path, name)
|
||||
if fi, err := os.Stat(fullpath); err == nil && fi.Mode().IsRegular() {
|
||||
return fullpath, nil
|
||||
}
|
||||
}
|
||||
if searchPATH {
|
||||
return exec.LookPath(name)
|
||||
}
|
||||
if len(c.Engine.HelperBinariesDir) == 0 {
|
||||
return "", errors.Errorf("could not find %q because there are no helper binary directories configured", name)
|
||||
}
|
||||
return "", errors.Errorf("could not find %q in one of %v", name, c.Engine.HelperBinariesDir)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user