From fa9c65a74cf18e9c75cd3472112d5197532ac2f2 Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Tue, 30 May 2023 08:53:45 +0200 Subject: [PATCH 1/2] ci: Prune dangling images on RESTART_CI_DOCKER_BEFORE_RUN --- ci/test/04_install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh index 09d68ee0639..adbb244ef5b 100755 --- a/ci/test/04_install.sh +++ b/ci/test/04_install.sh @@ -43,6 +43,8 @@ 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" systemctl restart docker + echo "Prune all dangling images" + docker image prune --force fi # shellcheck disable=SC2086 From fa123077bc3f39aa0969d883e2d799a054cd4543 Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Tue, 30 May 2023 10:29:01 +0200 Subject: [PATCH 2/2] ci: Use podman for persistent workers --- ci/test/04_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh index adbb244ef5b..2a5689e2513 100755 --- a/ci/test/04_install.sh +++ b/ci/test/04_install.sh @@ -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" - systemctl restart docker + podman container kill --all # Similar to "systemctl restart docker" echo "Prune all dangling images" docker image prune --force fi