0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-03 09:56:38 -05:00

Merge bitcoin/bitcoin#27844: ci: Use podman stop over podman kill

faaa62754e 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 https://github.com/bitcoin/bitcoin/pull/27777#discussion_r1217942753

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

Tree-SHA512: d46a32429629dcfa711a2d0abe79100f5593d72f8e5eded7b505b0f270e28abfeba0a96bec43e9951a76a96bb23fe2c7092433e5e0c66510e3e3b6c3cb58f4db
This commit is contained in:
fanquake 2023-06-12 09:52:56 +01:00
commit 5111d8e02f
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1

View file

@ -42,7 +42,7 @@ if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
if [ -n "${RESTART_CI_DOCKER_BEFORE_RUN}" ] ; then if [ -n "${RESTART_CI_DOCKER_BEFORE_RUN}" ] ; then
echo "Restart docker before run to stop and clear all containers started with --rm" 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" echo "Prune all dangling images"
docker image prune --force docker image prune --force
fi fi