From fa695b4df069425414fd26b2ddc08d72a6b506f6 Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Thu, 28 Sep 2023 11:18:31 +0200 Subject: ci: Work around podman stop bug Force remove any containers, pontentially leaving dangling processes, which should be fine. --- ci/test/02_run_container.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'ci') diff --git a/ci/test/02_run_container.sh b/ci/test/02_run_container.sh index 8602353b45..96fae73359 100755 --- a/ci/test/02_run_container.sh +++ b/ci/test/02_run_container.sh @@ -29,14 +29,12 @@ 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 stop --all # Similar to "systemctl restart docker" + podman container rm --force --all # Similar to "systemctl restart docker" echo "Prune all dangling images" docker image prune --force fi # shellcheck disable=SC2086 - - CI_CONTAINER_ID=$(docker run --cap-add LINUX_IMMUTABLE $CI_CONTAINER_CAP --rm --interactive --detach --tty \ --mount "type=bind,src=$BASE_READ_ONLY_DIR,dst=$BASE_READ_ONLY_DIR,readonly" \ --mount "type=volume,src=${CONTAINER_NAME}_ccache,dst=$CCACHE_DIR" \ -- cgit v1.2.3