From 8c49680675c7132f4a7415f63c844f95ca9e16d6 Mon Sep 17 00:00:00 2001 From: Mikhail Klementev Date: Fri, 26 May 2023 17:01:53 +0000 Subject: [PATCH] feat: add container timeout parameter to kernel command --- config/out-of-tree.go | 2 +- kernel.go | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/config/out-of-tree.go b/config/out-of-tree.go index 408712f..0ccf889 100644 --- a/config/out-of-tree.go +++ b/config/out-of-tree.go @@ -104,7 +104,7 @@ func ReadOutOfTreeConf(path string) (c OutOfTree, err error) { } if c.Docker.Timeout.Duration == 0 { - c.Docker.Timeout.Duration = time.Minute + c.Docker.Timeout.Duration = 8 * time.Minute } return diff --git a/kernel.go b/kernel.go index 84802a4..0a89b46 100644 --- a/kernel.go +++ b/kernel.go @@ -32,6 +32,8 @@ type KernelCmd struct { Update bool `help:"update container"` Max int `help:"maximum kernels to download" default:"100500"` + ContainerTimeout time.Duration `help:"container timeout"` + List KernelListCmd `cmd:"" help:"list kernels"` ListRemote KernelListRemoteCmd `cmd:"" help:"list remote kernels"` Autogen KernelAutogenCmd `cmd:"" help:"generate kernels based on the current config"` @@ -159,6 +161,10 @@ func (cmd *KernelCmd) Generate(g *Globals, km config.Target) (err error) { container.Commands = g.Config.Docker.Commands container.Registry = g.Config.Docker.Registry + container.Timeout = g.Config.Docker.Timeout.Duration + if cmd.ContainerTimeout != 0 { + container.Timeout = cmd.ContainerTimeout + } log.Info().Msgf("Generating for target %v", km)