X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-cass%2Fdocker%2Fdbuild.sh;h=6a1ae1c1e264712b7815cc8a088c800ef3ba6b0e;hb=HEAD;hp=641b42ba1e44566cce6e4c714a77159c26a7bcd2;hpb=f727f876191f815a850b89eb501f49bfd6e65c5d;p=aaf%2Fauthz.git

diff --git a/auth/auth-cass/docker/dbuild.sh b/auth/auth-cass/docker/dbuild.sh
index 641b42ba..6a1ae1c1 100644
--- a/auth/auth-cass/docker/dbuild.sh
+++ b/auth/auth-cass/docker/dbuild.sh
@@ -26,6 +26,19 @@ if [ -e ../../docker/d.props ]; then
 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"
 
 # default nexus repo only contains Amd64 images, use docker.io for multi-platform builds
@@ -38,16 +51,15 @@ echo "$0: DOCKER_PULL_REGISTRY=${DOCKER_REGISTRY}"
 
 DIR=$(pwd)
 cd ..
-sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \
-    -e 's/${USER}/'${USER}'/g' \
+sed -e 's/${AAF_VERSION}/'${VERSION/-SNAPSHOT/}'/g' \
+    -e 's/${DUSER}/'${DUSER}'/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
-ls -ltr auth-batch/target
-cp auth-batch/target/aaf-auth-batch-$VERSION-full.jar auth-cass
+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
@@ -58,6 +70,6 @@ cd -
 rm Dockerfile
 rm -Rf cass_data
 rm sample.identities.dat
-rm aaf-auth-batch-$VERSION-full.jar
+rm aaf-auth-batch-*-full.jar
 cd $DIR