mirror of
https://github.com/containers/podman.git
synced 2025-12-03 19:59:39 +08:00
Update vendor of containers/(storage,image)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
3
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
3
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
@@ -28,7 +28,7 @@ const (
|
||||
_defaultTransport = "docker://"
|
||||
|
||||
// _defaultImageVolumeMode is a mode to handle built-in image volumes.
|
||||
_defaultImageVolumeMode = "bind"
|
||||
_defaultImageVolumeMode = _typeBind
|
||||
)
|
||||
|
||||
var (
|
||||
@@ -298,6 +298,7 @@ func defaultConfigFromMemory() (*EngineConfig, error) {
|
||||
c.CgroupManager = defaultCgroupManager()
|
||||
c.ServiceTimeout = uint(5)
|
||||
c.StopTimeout = uint(10)
|
||||
c.PodmanshTimeout = uint(30)
|
||||
c.ExitCommandDelay = uint(5 * 60)
|
||||
c.Remote = isRemote()
|
||||
c.OCIRuntimes = map[string][]string{
|
||||
|
||||
Reference in New Issue
Block a user