X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-cass%2Fdocker%2Fdbuild.sh;h=fb9bc8e0d749223253c6193160cf92aebdfd8c8c;hb=ab6dc4c77a4dd29ae4e31144abb568dd64bc015b;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..fb9bc8e0 100644 --- a/auth/auth-cass/docker/dbuild.sh +++ b/auth/auth-cass/docker/dbuild.sh @@ -38,7 +38,7 @@ 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 @@ -46,8 +46,8 @@ 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 +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 echo "$0: $DOCKER build -t ${ORG}/${PROJECT}/aaf_cass:${VERSION} auth-cass" $DOCKER build -t ${ORG}/${PROJECT}/aaf_cass:${VERSION} auth-cass @@ -58,6 +58,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