Set StopTimeout for compat API if not set by client

Currently containers created via DOCKER API without specifying StopTimeout are defaulting to 0 seconds. This change should default them to setting in containers.conf normally 10 seconds. Fixes: containers#19139 Signed-off-by: Daniel J Walsh <[email protected]>
rhatdan · Aug 24, 2023 · d2ec127 · d2ec127
1 parent 32f7bb1
commit d2ec127
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/pkg/api/handlers/compat/containers_create.go b/pkg/api/handlers/compat/containers_create.go
@@ -435,6 +435,7 @@ func cliOpts(cc handlers.CreateContainerConfig, rtc *config.Config) (*entities.C
 		Rm:                cc.HostConfig.AutoRemove,
 		SecurityOpt:       cc.HostConfig.SecurityOpt,
 		StopSignal:        cc.Config.StopSignal,
+		StopTimeout:       rtc.Engine.StopTimeout, // podman default
 		StorageOpts:       stringMaptoArray(cc.HostConfig.StorageOpt),
 		Sysctl:            stringMaptoArray(cc.HostConfig.Sysctls),
 		Systemd:           "true", // podman default

diff --git a/test/apiv2/20-containers.at b/test/apiv2/20-containers.at
@@ -308,6 +308,7 @@ cid_top=$(jq -r '.Id' <<<"$output")
 t GET containers/${cid_top}/json 200 \
   .Config.Entrypoint[0]="top" \
   .Config.Cmd='[]' \
+  .Config.StopTimeput="10" \
   .Path="top" \
   .NetworkSettings.Networks.podman.NetworkID=podman
 t POST  containers/${cid_top}/start 204