From 851724b9826cd903a019a5a5ab51295b1f902098 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 22 Aug 2023 17:15:27 -0400 Subject: [PATCH] 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: https://github.com/containers/podman/issues/19139 Signed-off-by: Daniel J Walsh --- pkg/api/handlers/compat/containers_create.go | 1 + test/apiv2/20-containers.at | 1 + 2 files changed, 2 insertions(+) diff --git a/pkg/api/handlers/compat/containers_create.go b/pkg/api/handlers/compat/containers_create.go index 19a541b4ecec..80d7d7f316e0 100644 --- 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 index 92074b0b28a6..b057ef893627 100644 --- 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