Stop container before removing it forcefully

pytest_container/container.py

@@ -1235,6 +1235,19 @@ def __exit__(
             mounts = self.container_runtime.inspect_container(
                 self._container_id
             ).mounts
+
+            _logger.debug(
+                "Stopping container %s via %s",
+                self._container_id,
+                self.container_runtime.runner_binary,
+            )
+            check_output(
+                [
+                    self.container_runtime.runner_binary,
+                    "stop",
+                    self._container_id,
+                ]
+            )
             _logger.debug(
                 "Removing container %s via %s",
                 self._container_id,

tests/files/entrypoint.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+mkdir -p /var/volume
+touch /var/volume/cleanup_confirmed
+
+trap "echo '1' > /var/volume/cleanup_confirmed" SIGTERM
+
+while true; do
+    sleep 5
+done

tests/test_container_build.py

@@ -8,6 +8,7 @@
 from pytest_container import DerivedContainer
 from pytest_container import get_extra_build_args
 from pytest_container.build import MultiStageBuild
+from pytest_container.container import BindMount
 from pytest_container.container import ContainerData
 from pytest_container.container import ContainerLauncher
 from pytest_container.container import EntrypointSelection
@@ -326,3 +327,30 @@ def test_multistage_build_target(
 @pytest.mark.parametrize("container", [LEAP_THAT_ECHOES_STUFF], indirect=True)
 def test_container_logs(container: ContainerData) -> None:
     assert "foobar" in container.read_container_logs()
+
+
+def test_container_stops_on_exit(
+    container_runtime: OciRuntimeBase,
+    pytestconfig: Config,
+    tmp_path: Path,
+):
+    _CONTAINER_THAT_TRAPS_SIGTERM = DerivedContainer(
+        base=BUSYBOX_WITH_ENTRYPOINT,
+        containerfile="""COPY tests/files/entrypoint.sh /usr/local/bin/entrypoint.sh
+RUN chmod +x /usr/local/bin/entrypoint.sh
+CMD ["/usr/local/bin/entrypoint.sh"]
+""",
+        volume_mounts=[
+            BindMount(host_path=tmp_path, container_path="/var/volume")
+        ],
+    )
+    with ContainerLauncher(
+        _CONTAINER_THAT_TRAPS_SIGTERM,
+        container_runtime,
+        pytestconfig.rootpath,
+    ) as launcher:
+        launcher.launch_container()
+        connection = launcher.container_data.connection
+        assert connection.file("/var/volume/cleanup_confirmed").exists
+
+    assert (tmp_path / "cleanup_confirmed").read_text().strip() == "1"