summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-03-07 13:32:52 -0500
committerGitHub <noreply@github.com>2022-03-07 13:32:52 -0500
commit2873f089f7de04cadc345f36bf405ae813a60765 (patch)
tree38eb26b31177176755b04c8ce00f3caccdd0576a
parent861d16921b46e553c1904a707a36ec7fb69aa81d (diff)
parent2fb6a8daf6da54a7103473ce8a2fc2dab855b184 (diff)
downloadpodman-2873f089f7de04cadc345f36bf405ae813a60765.tar.gz
podman-2873f089f7de04cadc345f36bf405ae813a60765.tar.bz2
podman-2873f089f7de04cadc345f36bf405ae813a60765.zip
Merge pull request #13414 from rvandernoort/exec_delay
Add ExitCommandDelay configuration use in API exec handler
-rw-r--r--pkg/api/handlers/compat/exec.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/api/handlers/compat/exec.go b/pkg/api/handlers/compat/exec.go
index c6f7e0318..def16d1b5 100644
--- a/pkg/api/handlers/compat/exec.go
+++ b/pkg/api/handlers/compat/exec.go
@@ -73,7 +73,7 @@ func ExecCreateHandler(w http.ResponseWriter, r *http.Request) {
// Run the exit command after 5 minutes, to mimic Docker's exec cleanup
// behavior.
- libpodConfig.ExitCommandDelay = 5 * 60
+ libpodConfig.ExitCommandDelay = runtimeConfig.Engine.ExitCommandDelay
sessID, err := ctr.ExecCreate(libpodConfig)
if err != nil {