Code Review
/
aaf
/
authz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Artifacts to Bootstrap
[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
4f2499c
..
21de1ac
100644
(file)
--- a/
auth/auth-cass/docker/drun.sh
+++ b/
auth/auth-cass/docker/drun.sh
@@
-1,26
+1,18
@@
-#!/bin/bash
+#!/bin/bash
# Pull in AAF Env Variables from AAF install
if [ -e ../../docker/d.props ]; then
. ../../docker/d.props
# Pull in AAF Env Variables from AAF install
if [ -e ../../docker/d.props ]; then
. ../../docker/d.props
-else
- . ../../docker/d.props.init
-fi
-
-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
fi
fi
+DOCKER=${DOCKER:-docker}
if [ "$($DOCKER volume ls | grep aaf_cass_data)" = "" ]; then
$DOCKER volume create aaf_cass_data
echo "Created Cassandra Volume aaf_cass_data"
fi
if [ "$($DOCKER volume ls | grep aaf_cass_data)" = "" ]; then
$DOCKER volume create aaf_cass_data
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.
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
+22,8
@@
if [ "`$DOCKER ps -a | grep aaf_cass`" == "" ]; then
-e MAX_HEAP_SIZE=1024M \
-e CASSANDRA_DC=dc1 \
-e CASSANDRA_CLUSTER_NAME=osaaf \
-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 ${
ORG}/${PROJECT}/aaf_cass:${VERSION}
+ -
v "aaf_cass_data:/var/lib/cassandra"
\
+ -d ${
PREFIX}${ORG}/${PROJECT}/aaf_cass:${VERSION} "onap"
else
$DOCKER start aaf_cass
fi
else
$DOCKER start aaf_cass
fi