From: Konrad Rosenbaum <konrad@silmor.de>
Date: Sun, 10 Dec 2017 06:57:06 +0000 (+0100)
Subject: advance docker builds
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=4ced47ea00523004b97c255562ec31685a5a0507;p=web%2Fkonrad%2Fsmoke.git

advance docker builds

Change-Id: I9a26113960f470ac304d770727ae4b8cd4782bdc
---

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 '<none>'|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"