DB Recover

[aaf/authz.git] / auth / auth-cass / docker / drun.sh

diff --git a/auth/auth-cass/docker/drun.sh b/auth/auth-cass/docker/drun.sh
index 4e56ce1..1bcff83 100644 (file)
--- a/auth/auth-cass/docker/drun.sh
+++ b/auth/auth-cass/docker/drun.sh
@@ -1,19 +1,13 @@
-#!/bin/bash 
+#!/bin/bash
 
 # Pull in AAF Env Variables from AAF install
 if [ -e ../../docker/d.props ]; then
   . ../../docker/d.props
-else
-  . ../../docker/d.props.init
 fi
+DOCKER=${DOCKER:-docker}
 
-if [ -e /usr/bin/docker ]; then 
-  DOCKER=/usr/bin/docker
-elif [ -e /usr/local/bin/docker ]; then
-  DOCKER=/usr/local/bin/docker
-else
-  echo Docker not available in /usr/bin or /usr/local/bin
-  exit
+if [ "$1" = "publish" ]; then
+  PUBLISH='--publish 9042:9042 '
 fi
 
 if [ "$($DOCKER volume ls | grep aaf_cass_data)" = "" ]; then
@@ -21,6 +15,8 @@ if [ "$($DOCKER volume ls | grep aaf_cass_data)" = "" ]; then
   echo "Created Cassandra Volume aaf_cass_data"
 fi
 
+# Optional mount instead of v
+#    --mount 'type=volume,src=aaf_cass_data,dst=/var/lib/cassandra,volume-driver=local' \
 if [ "`$DOCKER ps -a | grep aaf_cass`" == "" ]; then
   echo "starting Cass from 'run'"
   # NOTE: These HEAP Sizes are minimal. Not set for full organizations.
@@ -30,8 +26,9 @@ if [ "`$DOCKER ps -a | grep aaf_cass`" == "" ]; then
     -e MAX_HEAP_SIZE=1024M \
     -e CASSANDRA_DC=dc1 \
     -e CASSANDRA_CLUSTER_NAME=osaaf \
-    --mount 'type=volume,src=aaf_cass_data,dst=/var/lib/cassandra,volume-driver=local' \
-    -d ${PREFIX}${ORG}/${PROJECT}/aaf_cass:${VERSION} 
+    -v "aaf_cass_data:/var/lib/cassandra" \
+    $PUBLISH \
+    -d ${PREFIX}${ORG}/${PROJECT}/aaf_cass:${VERSION} "onap"
 else 
   $DOCKER start aaf_cass
 fi