X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-cass%2Fdocker%2Fdbuild.sh;h=7e2ac7c576ab0a9459b6d82541163cc92183f73f;hb=28d2e7a6daa59749f6fefa302840943961c3ba9e;hp=2913b1af16a6fe3ec8ae558e0d78e4f2a6cebe16;hpb=d7c4f7754624b14d5e91cf60e48730b922df5839;p=aaf%2Fauthz.git

diff --git a/auth/auth-cass/docker/dbuild.sh b/auth/auth-cass/docker/dbuild.sh
index 2913b1af..7e2ac7c5 100644
--- a/auth/auth-cass/docker/dbuild.sh
+++ b/auth/auth-cass/docker/dbuild.sh
@@ -25,27 +25,41 @@ 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"
 
 # default nexus repo only contains Amd64 images, use docker.io for multi-platform builds
-if [[ $1 && $1 == "docker.io" ]]; then
-    DOCKER_PULL_REGISTRY=''
-else 
-    DOCKER_PULL_REGISTRY='nexus3.onap.org:10001\/'
+if [ $# -gt 0 ]; then
+    if [ "$1" == "-r" ]; then
+      DOCKER_PULL_REGISTRY=$2
+    fi
 fi
 echo "$0: DOCKER_PULL_REGISTRY=${DOCKER_REGISTRY}"
 
 DIR=$(pwd)
 cd ..
-sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \
+sed -e 's/${AAF_VERSION}/'${VERSION/-SNAPSHOT/}'/g' \
     -e 's/${USER}/'${USER}'/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
-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
@@ -56,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