From: Instrumental <jgonap@stl.gathman.org>
Date: Tue, 10 Mar 2020 12:55:21 +0000 (-0500)
Subject: Container 2.1.18c
X-Git-Tag: 2.1.19~5
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=commitdiff_plain;h=28d2e7a6daa59749f6fefa302840943961c3ba9e

Container 2.1.18c

Issue-ID: AAF-1081
Signed-off-by: Instrumental <jgonap@stl.gathman.org>
Change-Id: Idfbb108082e1037ad93b9e34e4b389f210669157
---

diff --git a/auth/auth-cass/docker/dbuild.sh b/auth/auth-cass/docker/dbuild.sh
index fb9bc8e0..7e2ac7c5 100644
--- a/auth/auth-cass/docker/dbuild.sh
+++ b/auth/auth-cass/docker/dbuild.sh
@@ -25,6 +25,19 @@ if [ -e ../../docker/d.props ]; then
   . ../../docker/d.props
 fi
 DOCKER=${DOCKER:-docker}
+ 
+function SCP() {
+  SANS=${1/-SNAPSHOT/}
+  echo $1 = $SANS
+  if [ -e $SANS ]; then
+    cp $SANS $2
+  else
+
+    ln $1 $SANS
+    cp $SANS $2
+    rm $SANS
+  fi
+}
 
 echo "$0: Building aaf_cass Container for aaf_cass:$VERSION"
 
@@ -43,11 +56,10 @@ sed -e 's/${AAF_VERSION}/'${VERSION/-SNAPSHOT/}'/g' \
     -e 's/${REGISTRY}/'${DOCKER_PULL_REGISTRY}'/g' \
     $DIR/Dockerfile.cass > Dockerfile
 cd ..
+pwd
 cp -Rf sample/cass_data auth-cass/cass_data
 cp sample/data/sample.identities.dat auth-cass
-pwd
-cp auth-batch/target/aaf-auth-batch-$VERSION-full.jar auth-cass/aaf-auth-batch-${VERSION/-SNAPSHOT/}-full.jar
-ls -l auth-cass/*full.jar
+SCP auth-batch/target/aaf-auth-batch-$VERSION-full.jar auth-cass
 
 echo "$0: $DOCKER build -t ${ORG}/${PROJECT}/aaf_cass:${VERSION} auth-cass"
 $DOCKER build -t ${ORG}/${PROJECT}/aaf_cass:${VERSION} auth-cass