tools/out-of-tree
1
0
Fork 0
Code Releases Activity

feat: implement global docker timeout

Browse Source
This commit is contained in:
dump_stack()
2023-05-22 14:41:00 +00:00
parent 2fe3103603
commit fa5d0adb39
6 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
container/container.go
View File

@ -25,6 +25,8 @@ import (
var Runtime = "docker"
var Timeout = time.Hour
type Image struct {
Name string
Distro distro.Distro
@ -78,8 +80,6 @@ type Volume struct {
type Container struct {
name string
timeout time.Duration
Volumes []Volume
// Additional arguments
@ -88,13 +88,12 @@ type Container struct {
Log zerolog.Logger
}
func New(name string, timeout time.Duration) (c Container, err error) {
func New(name string) (c Container, err error) {
c.Log = log.With().
Str("container", name).
Logger()
c.name = name
c.timeout = timeout
c.Volumes = append(c.Volumes, Volume{
Src: config.Dir("volumes", name, "lib", "modules"),
@ -114,11 +113,10 @@ func New(name string, timeout time.Duration) (c Container, err error) {
return
}
func NewFromKernelInfo(ki config.KernelInfo, timeout time.Duration) (
func NewFromKernelInfo(ki config.KernelInfo) (
c Container, err error) {
c.name = ki.ContainerName
c.timeout = timeout
c.Log = log.With().
Str("container", c.name).
@ -211,7 +209,7 @@ func (c Container) Run(workdir string, command string) (output string, err error
}
cmd.Stderr = cmd.Stdout
timer := time.AfterFunc(c.timeout, func() {
timer := time.AfterFunc(Timeout, func() {
flog.Info().Msg("killing container by timeout")
flog.Debug().Msg("SIGINT")