Skip to content

Commit

Permalink
Merge bitcoin#27844: ci: Use podman stop over podman kill
Browse files Browse the repository at this point in the history
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#27777 (comment)

ACKs for top commit:
  dimitaracev:
    ACK [faaa627](bitcoin@faaa627)

Tree-SHA512: d46a32429629dcfa711a2d0abe79100f5593d72f8e5eded7b505b0f270e28abfeba0a96bec43e9951a76a96bb23fe2c7092433e5e0c66510e3e3b6c3cb58f4db
  • Loading branch information
fanquake authored and sidhujag committed Jun 12, 2023
1 parent 96a6479 commit 0c24230
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion ci/test/04_install.sh
Expand Up @@ -42,7 +42,7 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then

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

0 comments on commit 0c24230

Please sign in to comment.