Add Certs, Docker Build

Issue-ID: AAF-211
Change-Id: Idc7630578155586a6e53d7af80dd16e4e0ac41ca
Signed-off-by: Instrumental <jcgmisc@stl.gathman.org>

3 files changed, 20 insertions, 21 deletions

diff --git a/auth/docker/Dockerfile b/auth/docker/Dockerfile
index 60414de0..ce785d50 100644
--- a/auth/docker/Dockerfile
+++ b/auth/docker/Dockerfile
@@ -5,19 +5,20 @@ ENV VERSION=${AAF_VERSION}
 LABEL description="aaf ${AAF_COMPONENT}"
 LABEL version=${AAF_VERSION}
 
-RUN apt-get update
-RUN apt-get install -y softhsm2
-RUN apt-get install -y libsofthsm2
-RUN apt-get install -y opensc
+
+#RUN apt-get update
+#RUN apt-get install -y softhsm2
+#RUN apt-get install -y libsofthsm2
+#RUN apt-get install -y opensc
 
 COPY lib /opt/app/aaf/${AAF_COMPONENT}/lib
 COPY theme /opt/app/aaf/${AAF_COMPONENT}/theme
 COPY bin /opt/app/aaf/${AAF_COMPONENT}/bin
 
-CMD ["bash","/opt/app/aaf/${AAF_COMPONENT}/bin/${AAF_COMPONENT}"]
+CMD ["/bin/bash","/opt/app/aaf/${AAF_COMPONENT}/bin/${AAF_COMPONENT}"]
 
 # For Debugging installation
-# CMD ["bash"]     
+#CMD ["/bin/bash","-c","pwd;cd /opt/app/osaaf;find /opt/app/osaaf -depth;df -k; cat /opt/app/aaf/${AAF_COMPONENT}/bin/${AAF_COMPONENT}"]
 # Java Debugging VM Args
 #     "-Xdebug",\
 #     "-Xnoagent",\
@@ -26,4 +27,3 @@ CMD ["bash","/opt/app/aaf/${AAF_COMPONENT}/bin/${AAF_COMPONENT}"]
 # TLS Debugging VM Args
 #     "-Djavax.net.debug","ssl", \
      
-
diff --git a/auth/docker/dbuild.sh b/auth/docker/dbuild.sh
index b97ef6ab..54d9926a 100644
--- a/auth/docker/dbuild.sh
+++ b/auth/docker/dbuild.sh
@@ -1,10 +1,9 @@
+#!/bin/bash dbuild.sh
 #
 # Docker Building Script.  Reads all the components generated by install, on per-version basis
 #
-ORG=onap
-PROJECT=aaf
-DOCKER_REPOSITORY=nexus3.onap.org:10003
-VERSION=2.1.0-SNAPSHOT
+# Pull in Variables from d.props
+. d.props
 # TODO add ability to do DEBUG settings
 
 if ["$1" == ""]; then
@@ -14,6 +13,7 @@ else
 fi
 
 for AAF_COMPONENT in ${AAF_COMPONENTS}; do
+        echo Building aaf_$AAF_COMPONENT...
         sed -e 's/${AAF_VERSION}/'${VERSION}'/g' -e 's/${AAF_COMPONENT}/'${AAF_COMPONENT}'/g' Dockerfile > ../aaf_${VERSION}/Dockerfile
         cd ..
         docker build -t ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION}  aaf_${VERSION}
diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index 601feaf3..775c0c45 100644
--- a/auth/docker/drun.sh
+++ b/auth/docker/drun.sh
@@ -1,7 +1,5 @@
-HOSTNAME=meriadoc.mithril.sbc.com
-HOST_IP=172.17.0.3
-CASS_HOST="cass.mithril.sbc.com:172.17.0.3"
-VERSION=2.1.0-SNAPSHOT
+#!/bin/bash drun.sh
+. d.props
 
 if [ "$1" == "" ]; then
   AAF_COMPONENTS=`ls ../aaf_${VERSION}/bin | grep -v '\.'`
@@ -10,10 +8,9 @@ else
 fi
   
 for AAF_COMPONENT in ${AAF_COMPONENTS}; do 
-	
 	case "$AAF_COMPONENT" in
 		"service") PORTMAP="8100:8100";;
-		"locate") PORTMAP="443:8095";;
+		"locate") PORTMAP="8095:8095";;
 		"oauth") PORTMAP="8140:8140";;
 		"gui") PORTMAP="8200:8200";;
 		"cm") PORTMAP="8150:8150";;
@@ -21,15 +18,17 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
 		"fs") PORTMAP="80:8096";;
 	esac
 	
-#	if [ "`docker container ls | grep aaf_$AAF_COMPONENT:$VERSION`" == "" ]; then 
-		docker run \
+#	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 \
-		  --volume=/opt/app/osaaf/etc:/opt/app/osaaf/etc \
+		  --mount type=bind,source=$CONF_ROOT_DIR,target=/opt/app/osaaf \
 		  --link aaf_cass:cassandra \
-		  aaf_$AAF_COMPONENT:$VERSION
+		  ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION}
 #	else
 	  #echo docker container start -ia aaf_$AAF_COMPONENT
 #	fi