From 9996fbb5e035d1425cb3265842ecc6144cc2a05b Mon Sep 17 00:00:00 2001 From: Daming Date: Tue, 22 Oct 2019 18:24:36 +0800 Subject: [PATCH] [test/plugin] docker prune at cleanup (#3679) * docker prune at cleanup * update * no prune volumes * prune volumes --- test/plugin/run.sh | 9 ++++++++- test/plugin/script/systeminfo.sh | 5 +++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/test/plugin/run.sh b/test/plugin/run.sh index 66b3a124b..3ed198c3e 100644 --- a/test/plugin/run.sh +++ b/test/plugin/run.sh @@ -105,7 +105,14 @@ waitForAvailable() { } do_cleanup() { - docker images -q "skywalking/agent-test-*:${build_id}" | xargs -r docker rmi -f + images=$(docker images -q "skywalking/agent-test-*:${build_id}") + [[ -n "${images}" ]] && docker rmi -f ${images} + images=$(docker images -qf "dangling=true") + [[ -n "${images}" ]] && docker rmi -f ${images} + + docker network prune -f + docker volume prune -f + [[ -d ${home}/dist ]] && rm -rf ${home}/dist [[ -d ${home}/workspace ]] && rm -rf ${home}/workspace } diff --git a/test/plugin/script/systeminfo.sh b/test/plugin/script/systeminfo.sh index ccee064ea..f394403c9 100644 --- a/test/plugin/script/systeminfo.sh +++ b/test/plugin/script/systeminfo.sh @@ -25,11 +25,12 @@ load_average=$(uptime |grep -o --color=never "load average:.*") echo -e "CPU usage rate: ${cpu_usage_rate}, ${load_average} \n" -running=$(docker ps -q |wc -l) +runnings=$(docker ps -q |wc -l) all=$(docker ps -aq |wc -l) volumes=$(docker volume ls |wc -l) +danglings=$(docker images -qf dangling=true |wc -l) -echo -e "docker stats: running=${running:=0}, all=${all:=0}, volumes=${volumes:=0}\n" +echo -e "docker stats: runnings=${runnings:=0}, all=${all:=0}, volumes=${volumes:=0}, dangling images:${danglings}\n" echo -e "Memory usage:" free -m