summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@pm.me>2020-06-02 14:02:54 -0400
committerMatthew Heon <matthew.heon@pm.me>2020-06-02 15:30:42 -0400
commite0d940463475b907d56aa548401f8ba916cec21b (patch)
tree9f3f8ef1b4b795802885204283b74a9241bd7a3c /contrib
parentd10addca6c4eef4a3ab93336d1080eead3784caa (diff)
downloadpodman-e0d940463475b907d56aa548401f8ba916cec21b.tar.gz
podman-e0d940463475b907d56aa548401f8ba916cec21b.tar.bz2
podman-e0d940463475b907d56aa548401f8ba916cec21b.zip
Enable detached exec for remote
The biggest obstacle here was cleanup - we needed a way to remove detached exec sessions after they exited, but there's no way to tell if an exec session will be attached or detached when it's created, and that's when we must add the exit command that would do the removal. The solution was adding a delay to the exit command (5 minutes), which gives sufficient time for attached exec sessions to retrieve the exit code of the session after it exits, but still guarantees that they will be removed, even for detached sessions. This requires Conmon 2.0.17, which has the new `--exit-delay` flag. As part of the exit command rework, we can drop the hack we were using to clean up exec sessions (remove them as part of inspect). This is a lot cleaner, and I'm a lot happier about it. Otherwise, this is just plumbing - we need a bindings call for detached exec, and that needed to be added to the tunnel mode backend for entities. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/cirrus/setup_environment.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 945b33909..25b7ff941 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -46,6 +46,9 @@ case "${OS_RELEASE_ID}" in
workaround_bfq_bug
+ # HACK: Need Conmon 2.0.17, currently in updates-testing on F31.
+ dnf update -y --enablerepo=updates-testing conmon
+
if [[ "$ADD_SECOND_PARTITION" == "true" ]]; then
bash "$SCRIPT_BASE/add_second_partition.sh"
fi