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

diff --git a/auth/auth-cass/docker/dbuild.sh b/auth/auth-cass/docker/dbuild.sh
index aeef3293..641b42ba 100644
--- a/auth/auth-cass/docker/dbuild.sh
+++ b/auth/auth-cass/docker/dbuild.sh
@@ -1,30 +1,63 @@
 #!/bin/bash
-# 
+#########
+#  ============LICENSE_START====================================================
+#  org.onap.aaf
+#  ===========================================================================
+#  Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+#  ===========================================================================
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#  ============LICENSE_END====================================================
+#
 # Build AAF Cass Docker Script locally
 #
 # Pull in AAF Env Variables from AAF install
 if [ -e ../../docker/d.props ]; then
   . ../../docker/d.props
-else
-  . ../../docker/d.props.init
 fi
+DOCKER=${DOCKER:-docker}
 
-echo "Building aaf_cass Container for aaf_cass:$VERSION"
+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 [ $# -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' $DIR/Dockerfile.cass > Dockerfile
+sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \
+    -e 's/${USER}/'${USER}'/g' \
+    -e 's/${REGISTRY}/'${DOCKER_PULL_REGISTRY}'/g' \
+    $DIR/Dockerfile.cass > Dockerfile
 cd ..
 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
 
-docker build -t ${ORG}/${PROJECT}/aaf_cass:${VERSION} auth-cass
-docker tag ${ORG}/${PROJECT}/aaf_cass:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_cass:${VERSION}
-docker tag ${ORG}/${PROJECT}/aaf_cass:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_cass:latest
+echo "$0: $DOCKER build -t ${ORG}/${PROJECT}/aaf_cass:${VERSION} auth-cass"
+$DOCKER build -t ${ORG}/${PROJECT}/aaf_cass:${VERSION} auth-cass
+$DOCKER tag ${ORG}/${PROJECT}/aaf_cass:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_cass:${VERSION}
+$DOCKER tag ${ORG}/${PROJECT}/aaf_cass:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_cass:latest
 
 cd -
 rm Dockerfile
 rm -Rf cass_data
 rm sample.identities.dat
+rm aaf-auth-batch-$VERSION-full.jar
 cd $DIR