starred/ansible
1
0
Fork 0
mirror of https://github.com/ansible/ansible.git synced 2026-08-03 16:12:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

[stable-2.16] ansible-test - Use -t for container stop timeout (#85019) (#85058)

Browse Source 
(cherry picked from commit 0aa8afbaf4)
This commit is contained in:
Matt Clay
2025-04-29 04:54:09 +00:00
committed by GitHub
parent cd23556e80
commit 80156dc807
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelogs/fragments/ansible-test-container-stop.yml
+3
View File
@@ -0,0 +1,3 @@
minor_changes:
- ansible-test - Use the ``-t`` option to set the stop timeout when stopping a container.
This avoids use of the ``--time`` option which was deprecated in Docker v28.0.
test/lib/ansible_test/_internal/docker_util.py
+4 -3
View File
@@ -721,9 +721,10 @@ def docker_rm(args: CommonConfig, container_id: str) -> None:
"""Remove the specified container."""
try:
# Stop the container with SIGKILL immediately, then remove the container.
# Podman supports the `--time` option on `rm`, but only since version 4.0.0.
# Docker does not support the `--time` option on `rm`.
docker_command(args, ['stop', '--time', '0', container_id], capture=True)
# Docker supports `--timeout` for stop. The `--time` option was deprecated in v28.0.
# Podman supports `--time` for stop. The `--timeout` option was deprecated in 1.9.0.
# Both Docker and Podman support the `-t` option for stop.
docker_command(args, ['stop', '-t', '0', container_id], capture=True)
docker_command(args, ['rm', container_id], capture=True)
except SubprocessError as ex:
# Both Podman and Docker report an error if the container does not exist.