diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-03 00:02:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-03 00:02:20 +0200 |
| commit | 26bb48951fa55924fd4cdb9b2ef72e19a471b959 (patch) | |
| tree | 202118fd8fe72e215b9795cb8d1f506a69dc62cb /libpod/oci_conmon_exec_linux.go | |
| parent | 4632a4b706e94fce7f85e53659dd04484d988ac7 (diff) | |
| parent | 69020c7040415b532f4fe5aaaacdbd288a67b71e (diff) | |
| download | podman-26bb48951fa55924fd4cdb9b2ef72e19a471b959.tar.gz podman-26bb48951fa55924fd4cdb9b2ef72e19a471b959.tar.bz2 podman-26bb48951fa55924fd4cdb9b2ef72e19a471b959.zip | |
Merge pull request #6468 from mheon/remote_detached_exec
Enable detached exec for remote
Diffstat (limited to 'libpod/oci_conmon_exec_linux.go')
| -rw-r--r-- | libpod/oci_conmon_exec_linux.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libpod/oci_conmon_exec_linux.go b/libpod/oci_conmon_exec_linux.go index 51819f90a..bc39100f8 100644 --- a/libpod/oci_conmon_exec_linux.go +++ b/libpod/oci_conmon_exec_linux.go @@ -421,12 +421,14 @@ func (r *ConmonOCIRuntime) startExec(c *Container, sessionID string, options *Ex for _, arg := range options.ExitCommand[1:] { args = append(args, []string{"--exit-command-arg", arg}...) } + if options.ExitCommandDelay > 0 { + args = append(args, []string{"--exit-delay", fmt.Sprintf("%d", options.ExitCommandDelay)}...) + } } logrus.WithFields(logrus.Fields{ "args": args, }).Debugf("running conmon: %s", r.conmonPath) - // TODO: Need to pass this back so we can wait on it. execCmd := exec.Command(r.conmonPath, args...) // TODO: This is commented because it doesn't make much sense in HTTP |