Merge pull request #953 from stilor/docker-testing2

Docker configuration for Gentoo + a bunch of fixes

1 files changed, 8 insertions, 2 deletions

diff --git a/testing/docker/dmgr.sh b/testing/docker/dmgr.sh
index 5dbb8b2..1f2b120 100755
--- a/testing/docker/dmgr.sh
+++ b/testing/docker/dmgr.sh
@@ -24,6 +24,9 @@ ${1:+ERROR :: $1
 Action is one of:
 
    build     Build or rebuild the specified containers.
+   test      Run tests (build-all).
+   enter     Spawn a shell in the specified container.
+   clean     Clean up in the specified container.
 
 If containers are not specified, the action is applied to all available containers.
 EOF
@@ -83,7 +86,10 @@ action_clean()
     local cntr=$1
 
     msg "Cleaning up after ${cntr}"
-    rm -rf build-${cntr}
+    if [ -d build-${cntr} ]; then
+        chmod -R +w build-${cntr}
+        rm -rf build-${cntr}
+    fi
 }
 
 action=$1
@@ -94,7 +100,7 @@ selected_containers="${*:-${all_containers}}"
 case "${action}" in
     build|test|enter|clean)
         for c in ${selected_containers}; do
-            eval "action_${action} $c"
+            eval "action_${action} ${c}"
         done
         ;;
     "")