diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-01 10:04:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-01 10:04:19 +0200 |
| commit | ccf4ec295b9a144740b07a202432aa34a7cce3de (patch) | |
| tree | 4859563846256c2a7f30b7637bfb4651f967f6fa /libpod/runtime.go | |
| parent | 39de184b8bfb14954f77190f0e6127c1ddc363c0 (diff) | |
| parent | 7dfaef7766871e5fd914eb0373b26db29df5bb46 (diff) | |
| download | podman-ccf4ec295b9a144740b07a202432aa34a7cce3de.tar.gz podman-ccf4ec295b9a144740b07a202432aa34a7cce3de.tar.bz2 podman-ccf4ec295b9a144740b07a202432aa34a7cce3de.zip | |
Merge pull request #3671 from openSUSE/runtime-path-discovery
Add runtime and conmon path discovery
Diffstat (limited to 'libpod/runtime.go')
| -rw-r--r-- | libpod/runtime.go | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index bb6bfbfcc..ffdbc32f1 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -5,6 +5,7 @@ import ( "fmt" "io/ioutil" "os" + "os/exec" "os/user" "path/filepath" "strings" @@ -740,8 +741,19 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (err error) { } foundConmon = true runtime.conmonPath = path + logrus.Debugf("using conmon: %q", path) break } + + // Search the $PATH as last fallback + if !foundConmon { + if conmon, err := exec.LookPath("conmon"); err == nil { + foundConmon = true + runtime.conmonPath = conmon + logrus.Debugf("using conmon from $PATH: %q", conmon) + } + } + if !foundConmon { return errors.Wrapf(define.ErrInvalidArg, "could not find a working conmon binary (configured options: %v)", @@ -938,10 +950,6 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (err error) { // Initialize remaining OCI runtimes for name, paths := range runtime.config.OCIRuntimes { - if len(paths) == 0 { - return errors.Wrapf(define.ErrInvalidArg, "must provide at least 1 path to OCI runtime %s", name) - } - supportsJSON := false for _, r := range runtime.config.RuntimeSupportsJSON { if r == name { |