X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fdocker%2Fdbuild.sh;h=3ecdd112ab60e76a7020637f7cf7164355defcf7;hb=0e302ed774f4c371b9414fe99836836f775b688d;hp=cdd97fc710d9c5016a979f9c3cb767db1846d889;hpb=d6bda193a97691213b20ea3c5b29a591d46a4641;p=aaf%2Fauthz.git

diff --git a/auth/docker/dbuild.sh b/auth/docker/dbuild.sh
index cdd97fc7..3ecdd112 100755
--- a/auth/docker/dbuild.sh
+++ b/auth/docker/dbuild.sh
@@ -21,8 +21,12 @@
 # Docker Building Script.  Reads all the components generated by install, on per-version basis
 #
 
-DOCKER_PULL_REGISTRY='nexus3.onap.org:10001\/'
-AAF_COMPONENTS=ALL
+# Pull in Variables from d.props
+if [ ! -e ./d.props ]; then
+    cp d.props.init d.props
+fi
+
+. ./d.props
 
 # process input. originally, an optional positional parameter is used to designate a component.
 # A flagged parameter has been added to optionally indicate docker pull registry. Ideally, options
@@ -45,13 +49,6 @@ fi
 
 echo "$0: AAF_COMPONENTS=$AAF_COMPONENTS DOCKER_PULL_REGISTRY=$DOCKER_PULL_REGISTRY"
 
-# Pull in Variables from d.props
-if [ ! -e ./d.props ]; then
-    cp d.props.init d.props
-fi
-
-. ./d.props
-
 DOCKER=${DOCKER:=docker}
 
 echo "Building Containers for aaf components, version $VERSION"
@@ -61,7 +58,8 @@ cd ../auth-cass/docker
 bash ./dbuild.sh $DOCKER_PULL_REGISTRY
 cd -
 
-# AAF Base version - set the core image, etc
+########
+# First, build a AAF Base version - set the core image, etc
 sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \
     -e 's/${DUSER}/'${DUSER}'/g' \
     -e 's/${REGISTRY}/'${DOCKER_PULL_REGISTRY}'/g' \
@@ -71,13 +69,13 @@ $DOCKER tag ${ORG}/${PROJECT}/aaf_base:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${
 $DOCKER tag ${ORG}/${PROJECT}/aaf_base:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_base:latest
 rm Dockerfile
 
-# Create the AAF Config (Security) Images
+########
+# Second, Create the AAF Config (Security) Images
 cd ..
 cp auth-cmd/target/aaf-auth-cmd-$VERSION-full.jar sample/bin
 cp auth-batch/target/aaf-auth-batch-$VERSION-full.jar sample/bin
 cp -Rf ../conf/CA sample
 
-
 # AAF Config image (for AAF itself)
 sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \
     -e 's/${AAF_COMPONENT}/'${AAF_COMPONENT}'/g' \
@@ -94,7 +92,7 @@ sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \
     -e 's/${AAF_COMPONENT}/'${AAF_COMPONENT}'/g' \
     -e 's/${DOCKER_REPOSITORY}/'${DOCKER_REPOSITORY}'/g' \
     -e 's/${DUSER}/'${DUSER}'/g' \
-    docker/Dockerfile.client > sample/Dockerfile
+    docker/Dockerfile.agent > sample/Dockerfile
 $DOCKER build -t ${ORG}/${PROJECT}/aaf_agent:${VERSION} sample
 $DOCKER tag ${ORG}/${PROJECT}/aaf_agent:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_agent:${VERSION}
 $DOCKER tag ${ORG}/${PROJECT}/aaf_agent:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_agent:latest
@@ -105,8 +103,9 @@ rm -Rf sample/CA
 cd -
 
 ########
-# Second, build a core Docker Image
+# Third, build a core Docker Image to be used for all AAF Components
 echo Building aaf_$AAF_COMPONENT...
+cp ../sample/bin/pod_wait.sh  ../aaf_${VERSION}/bin
 # Apply currrent Properties to Docker file, and put in place.
 sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \
     -e 's/${AAF_COMPONENT}/'${AAF_COMPONENT}'/g' \
@@ -114,34 +113,16 @@ sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \
     -e 's/${DUSER}/'${DUSER}'/g' \
     Dockerfile.core >../aaf_${VERSION}/Dockerfile
 cd ..
+echo "#######"
+pwd
+echo "#######"
 $DOCKER build -t ${ORG}/${PROJECT}/aaf_core:${VERSION} aaf_${VERSION}
 $DOCKER tag ${ORG}/${PROJECT}/aaf_core:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_core:${VERSION}
 $DOCKER tag ${ORG}/${PROJECT}/aaf_core:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_core:latest
 rm aaf_${VERSION}/Dockerfile
-cd -
 
-#######
-# Do all the Containers related to AAF Services
-#######
-if [ $AAF_COMPONENTS == "ALL" ]; then
-    AAF_COMPONENTS=$(ls ../aaf_${VERSION}/bin | grep -v '\.')
-fi
-echo "$0: AAF_COMPONENTS=$AAF_COMPONENTS"
 
-cp ../sample/bin/pod_wait.sh  ../aaf_${VERSION}/bin
-for AAF_COMPONENT in ${AAF_COMPONENTS}; do
-    echo Building aaf_$AAF_COMPONENT...
-    sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \
-        -e 's/${AAF_COMPONENT}/'${AAF_COMPONENT}'/g' \
-        -e 's/${DOCKER_REPOSITORY}/'${DOCKER_REPOSITORY}'/g' \
-        -e 's/${DUSER}/'${DUSER}'/g' \
-        Dockerfile.ms >../aaf_${VERSION}/Dockerfile
-    cd ..
-    $DOCKER build -t ${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} aaf_${VERSION}
-    $DOCKER tag ${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION}
-    $DOCKER tag ${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:latest
-    rm aaf_${VERSION}/Dockerfile
-    cd -
-
-done
-rm ../aaf_${VERSION}/bin/pod_wait.sh
+# Final cleanup
+rm aaf_${VERSION}/bin/pod_wait.sh
+
+cd -