Service required changed startup
Issue-ID: AAF-211
Change-Id: Id4101ca0e59c5a2a3deaf703dc8fdd07183f3b4d
Signed-off-by: Instrumental <jcgmisc@stl.gathman.org>
diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml
index 1659285..3a99b97 100644
--- a/auth/auth-service/pom.xml
+++ b/auth/auth-service/pom.xml
@@ -120,7 +120,7 @@
<mainClass>org.onap.aaf.auth.service.AAF_Service</mainClass>
<name>service</name>
<commandLineArguments>
- <commandLineArgument>cadi_prop_files=${project.conf_dir}/org.osaaf.service.props</commandLineArgument>
+ <commandLineArgument>cadi_prop_files=${project.ext_root_dir}/etc/org.osaaf.service.props</commandLineArgument>
<commandLineArgument>cadi_log_dir=${project.ext_root_dir}/logs/service</commandLineArgument>
</commandLineArguments>
</program>
diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index 775c0c4..179a7da 100644
--- a/auth/docker/drun.sh
+++ b/auth/docker/drun.sh
@@ -2,7 +2,7 @@
. d.props
if [ "$1" == "" ]; then
- AAF_COMPONENTS=`ls ../aaf_${VERSION}/bin | grep -v '\.'`
+ AAF_COMPONENTS=`ls -r ../aaf_${VERSION}/bin | grep -v '\.'`
else
AAF_COMPONENTS=$1
fi
@@ -18,19 +18,15 @@
"fs") PORTMAP="80:8096";;
esac
-# if [ "`docker container ls | grep aaf_$AAF_COMPONENT:$VERSION`" == "" ]; then
- echo Starting aaf_$AAF_COMPONENT...
- docker run \
- -d \
- --name aaf_$AAF_COMPONENT \
- --hostname="$HOSTNAME" \
- --add-host="$CASS_HOST" \
- --publish $PORTMAP \
- --mount type=bind,source=$CONF_ROOT_DIR,target=/opt/app/osaaf \
- --link aaf_cass:cassandra \
- ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION}
-# else
- #echo docker container start -ia aaf_$AAF_COMPONENT
-# fi
+ echo Starting aaf_$AAF_COMPONENT...
+ docker run \
+ -d \
+ --name aaf_$AAF_COMPONENT \
+ --hostname="$HOSTNAME" \
+ --add-host="$CASS_HOST" \
+ --publish $PORTMAP \
+ --mount type=bind,source=$CONF_ROOT_DIR,target=/opt/app/osaaf \
+ --link aaf_cass:cassandra \
+ ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION}
done
# --add-host="$HOSTNAME:$HOST_IP" \