mirror of
https://github.com/containers/podman.git
synced 2025-09-28 01:04:28 +08:00
[NO TESTS NEEDED] Vendor in containers/buildah v1.20.0
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
3
vendor/github.com/containers/buildah/util/util.go
generated
vendored
3
vendor/github.com/containers/buildah/util/util.go
generated
vendored
@ -10,6 +10,7 @@ import (
|
||||
"sync"
|
||||
"syscall"
|
||||
|
||||
"github.com/containers/buildah/define"
|
||||
"github.com/containers/common/pkg/config"
|
||||
"github.com/containers/image/v5/docker/reference"
|
||||
"github.com/containers/image/v5/pkg/shortnames"
|
||||
@ -280,7 +281,7 @@ func Runtime() string {
|
||||
conf, err := config.Default()
|
||||
if err != nil {
|
||||
logrus.Warnf("Error loading container config when searching for local runtime: %v", err)
|
||||
return DefaultRuntime
|
||||
return define.DefaultRuntime
|
||||
}
|
||||
return conf.Engine.OCIRuntime
|
||||
}
|
||||
|
Reference in New Issue
Block a user