Skip to content

Commit 5111d8e

Browse files
committed
Merge bitcoin/bitcoin#27844: ci: Use podman stop over podman kill
faaa627 ci: Use podman stop over podman kill (MarcoFalke) Pull request description: This should avoid a race where the kill is not done when spinning up the new container. podman stop waits 10 seconds by default. Fixes bitcoin/bitcoin#27777 (comment) ACKs for top commit: dimitaracev: ACK [faaa627](bitcoin/bitcoin@faaa627) Tree-SHA512: d46a32429629dcfa711a2d0abe79100f5593d72f8e5eded7b505b0f270e28abfeba0a96bec43e9951a76a96bb23fe2c7092433e5e0c66510e3e3b6c3cb58f4db
2 parents bc80b2d + faaa627 commit 5111d8e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

ci/test/04_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
4242

4343
if [ -n "${RESTART_CI_DOCKER_BEFORE_RUN}" ] ; then
4444
echo "Restart docker before run to stop and clear all containers started with --rm"
45-
podman container kill --all # Similar to "systemctl restart docker"
45+
podman container stop --all # Similar to "systemctl restart docker"
4646
echo "Prune all dangling images"
4747
docker image prune --force
4848
fi

0 commit comments

Comments
 (0)