[ARVADOS-DEV] updated: f794ddd776cc76fcfa918d78c94287158be3866e

[git at public.curoverse.com]

Summary of changes:
 arvbox/bin/arvbox | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

       via  f794ddd776cc76fcfa918d78c94287158be3866e (commit)
      from  f82f8be7ab3c1cde23f629cdff5cf71205483d04 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit f794ddd776cc76fcfa918d78c94287158be3866e
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Jan 6 12:10:44 2016 -0500

    8080: Check container state before stop/rm

diff --git a/arvbox/bin/arvbox b/arvbox/bin/arvbox
index a7cc884..8e01457 100755
--- a/arvbox/bin/arvbox
+++ b/arvbox/bin/arvbox
@@ -90,9 +90,11 @@ run() {
 }
 
 stop() {
-    if docker ps -a |grep -E "\b$ARVBOX_CONTAINER\b" -q ; then
+    if docker ps -a --filter "status=running" |grep -E "$ARVBOX_CONTAINER$" -q ; then
         docker stop $ARVBOX_CONTAINER
-        docker rm -v $ARVBOX_CONTAINER
+    fi
+    if docker ps -a --filter "status=exited" |grep -E "$ARVBOX_CONTAINER$" -q ; then
+        docker rm --volumes=true $ARVBOX_CONTAINER
     fi
 }
 

-----------------------------------------------------------------------


hooks/post-receive
--