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

diff --git a/auth/docker/dbuild.sh b/auth/docker/dbuild.sh
old mode 100755
new mode 100644
index cdd97fc7..0a816461
--- a/auth/docker/dbuild.sh
+++ b/auth/docker/dbuild.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+
 #########
 #  ============LICENSE_START====================================================
 #  org.onap.aaf
@@ -21,8 +21,15 @@
 # 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
+
+# Remove "SNAPSHOT" from AAF Jars in Containers
+JAR_VERSION=${VERSION/-SNAPSHOT/}
 
 # 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
@@ -43,26 +50,23 @@ if [ $# -gt 0 ]; then
     fi
 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
+grep -v '#' d.props | grep '=' | grep -v -e "=$"
 
 DOCKER=${DOCKER:=docker}
 
 echo "Building Containers for aaf components, version $VERSION"
-
 # AAF_cass now needs a version...
+echo "### Build Cass"
 cd ../auth-cass/docker
+pwd
 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
+echo "### Build Base"
 sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \
+    -e 's/${JAR_VERSION}/'${JAR_VERSION}'/g' \
     -e 's/${DUSER}/'${DUSER}'/g' \
     -e 's/${REGISTRY}/'${DOCKER_PULL_REGISTRY}'/g' \
     Dockerfile.base > Dockerfile
@@ -71,15 +75,33 @@ $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
+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
+}
+
+########
+# 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
+# Note: only 2 jars each in Agent/Config
+SCP auth-cmd/target/aaf-auth-cmd-$VERSION-full.jar sample/bin
+SCP auth-batch/target/aaf-auth-batch-$VERSION-full.jar sample/bin
+SCP ../cadi/aaf/target/aaf-cadi-aaf-${VERSION}-full.jar sample/bin
+SCP ../cadi/servlet-sample/target/aaf-cadi-servlet-sample-${VERSION}-sample.jar sample/bin
 cp -Rf ../conf/CA sample
 
-
 # AAF Config image (for AAF itself)
+echo "### Build Config"
 sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \
+    -e 's/${JAR_VERSION}/'${JAR_VERSION}'/g' \
     -e 's/${AAF_COMPONENT}/'${AAF_COMPONENT}'/g' \
     -e 's/${DOCKER_REPOSITORY}/'${DOCKER_REPOSITORY}'/g' \
     -e 's/${DUSER}/'${DUSER}'/g' \
@@ -88,60 +110,98 @@ $DOCKER build -t ${ORG}/${PROJECT}/aaf_config:${VERSION} sample
 $DOCKER tag ${ORG}/${PROJECT}/aaf_config:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_config:${VERSION}
 $DOCKER tag ${ORG}/${PROJECT}/aaf_config:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_config:latest
 
-cp ../cadi/servlet-sample/target/aaf-cadi-servlet-sample-${VERSION}-sample.jar sample/bin
+
 # AAF Agent Image (for Clients)
+echo "### Build Agent"
 sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \
+    -e 's/${JAR_VERSION}/'${JAR_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
 
 # Clean up 
-rm sample/Dockerfile sample/bin/aaf-*-${VERSION}-full.jar sample/bin/aaf-cadi-servlet-sample-${VERSION}-sample.jar 
+rm sample/Dockerfile sample/bin/aaf-*-*.jar 
 rm -Rf sample/CA
 cd -
 
+
+########
+# Third Copy AAF Executables to a BUILD Directory, for easy Cleanup
+echo "### Copy to aaf_DBUILD"
+if [ -e "../aaf_$VERSION" ]; then
+  cp -Rf ../aaf_$VERSION ../aaf_DBUILD
+elif [ -e "../aaf_$JAR_VERSION" ]; then
+  cp -Rf ../aaf_$JAR_VERSION ../aaf_DBUILD
+else
+  echo "ERROR: No AAF Built.  use Maven"
+  exit
+fi
+if [ ! "$VERSION" = "$JAR_VERSION" ]; then 
+  START_DIR=$(pwd)
+  # Convert SNAPSHOT issues
+  cp -Rf ../aaf_$VERSION ../aaf_DBUILD
+  cd ../aaf_DBUILD/lib
+  # If Built Jars are "SNAPSHOT", convert to NON SNAPSHOT
+  for J in $(ls *-SNAPSHOT*); do mv $J ${J/-SNAPSHOT/}; done
+  cd ../bin
+  rm *.bat
+  for S in $(ls); do
+     sed -e "/$VERSION/s/$VERSION/$JAR_VERSION/g" $S > tmp
+     mv tmp $S
+  done
+  cd ${START_DIR}
+fi
+
 ########
-# Second, build a core Docker Image
-echo Building aaf_$AAF_COMPONENT...
+# Third, build a core Docker Image to be used for all AAF Components
+cp ../sample/bin/pod_wait.sh  ../aaf_DBUILD/bin
 # Apply currrent Properties to Docker file, and put in place.
 sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \
+    -e 's/${JAR_VERSION}/'${JAR_VERSION}'/g' \
     -e 's/${AAF_COMPONENT}/'${AAF_COMPONENT}'/g' \
     -e 's/${DOCKER_REPOSITORY}/'${DOCKER_REPOSITORY}'/g' \
     -e 's/${DUSER}/'${DUSER}'/g' \
-    Dockerfile.core >../aaf_${VERSION}/Dockerfile
+    Dockerfile.core >../aaf_DBUILD/Dockerfile
 cd ..
-$DOCKER build -t ${ORG}/${PROJECT}/aaf_core:${VERSION} aaf_${VERSION}
+
+echo "### Building Core"
+# Don't need "Hello" App in core
+mv aaf_DBUILD/lib/aaf-auth-hello-${JAR_VERSION}* /tmp
+
+$DOCKER build -t ${ORG}/${PROJECT}/aaf_core:${VERSION} aaf_DBUILD
 $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
+rm aaf_DBUILD/Dockerfile
+mv /tmp/aaf-auth-hello-${JAR_VERSION}* aaf_DBUILD/lib
+
+########
+# Fourth, do Hello
+# Apply currrent Properties to Docker file, and put in place.
+echo "### Building Hello"
 cd -
+sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \
+    -e 's/${JAR_VERSION}/'${JAR_VERSION}'/g' \
+    -e 's/${DOCKER_REPOSITORY}/'${DOCKER_REPOSITORY}'/g' \
+    -e 's/${DUSER}/'${DUSER}'/g' \
+    Dockerfile.hello >../aaf_DBUILD/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 -
+cp -Rf sample/etc aaf_DBUILD
+cp -Rf sample/logs aaf_DBUILD
 
+for C in cass certman cmd deforg fs gui locate oauth service; do
+   rm aaf_DBUILD/lib/aaf-auth-$C-*
 done
-rm ../aaf_${VERSION}/bin/pod_wait.sh
+
+$DOCKER build -t ${ORG}/${PROJECT}/aaf_hello:${VERSION} aaf_DBUILD
+$DOCKER tag ${ORG}/${PROJECT}/aaf_hello:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_hello:${VERSION}
+$DOCKER tag ${ORG}/${PROJECT}/aaf_hello:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_hello:latest
+
+# Final cleanup
+rm -Rf aaf_DBUILD
+
+cd -