From 4ced47ea00523004b97c255562ec31685a5a0507 Mon Sep 17 00:00:00 2001 From: Konrad Rosenbaum Date: Sun, 10 Dec 2017 07:57:06 +0100 Subject: [PATCH] advance docker builds Change-Id: I9a26113960f470ac304d770727ae4b8cd4782bdc --- tests/docker/cleanup.sh | 7 +++++++ tests/docker/qtenv/start.sh | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) create mode 100755 tests/docker/cleanup.sh diff --git a/tests/docker/cleanup.sh b/tests/docker/cleanup.sh new file mode 100755 index 0000000..b063777 --- /dev/null +++ b/tests/docker/cleanup.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +echo killing exited containers... +docker rm $(docker ps -a|grep Exited|cut -f 1 -d ' ') +echo cleaning up weakly names containers... +docker rmi $(docker images |grep ''|grep -v seconds|grep -v minute|while read a b c d ; do echo $c ; done) || true +echo done. diff --git a/tests/docker/qtenv/start.sh b/tests/docker/qtenv/start.sh index 66cc201..58aeca8 100755 --- a/tests/docker/qtenv/start.sh +++ b/tests/docker/qtenv/start.sh @@ -12,4 +12,4 @@ test -d /home/konrad/.config/qtchooser && { ln -sf /home/konrad/.config/qtchooser /jenkins/.config/qtchooser echo "Just Linked Qt-Chooser Dir." } || echo "Qt-Chooser Dir not Found, not Linking it." -su jenkins -c "nice java -jar slave.jar" +su jenkins -c "nice java -jar slave.jar $1/computer/$2/slave-agent.jnlp" -- 1.7.2.5