Merge "Admin.java: Fixed sonar issues"

[aaf/authz.git] / auth / docker / dbuild.sh

diff --git a/auth/docker/dbuild.sh b/auth/docker/dbuild.sh
index 517afe0..94fc7f4 100755 (executable)
--- a/auth/docker/dbuild.sh
+++ b/auth/docker/dbuild.sh
@@ -9,9 +9,17 @@ fi
 
 . ./d.props
 
+echo "Building Containers for aaf components, version $VERSION"
+
+# AAF_cass now needs a version...
+cd ../auth-cass/docker
+bash ./dbuild.sh
+cd -
+
 # Create the AAF Config (Security) Images
 cd ..
 cp ../cadi/aaf/target/aaf-cadi-aaf-${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' docker/Dockerfile.config > sample/Dockerfile
@@ -25,7 +33,9 @@ docker tag ${ORG}/${PROJECT}/aaf_agent:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${
 
 # Clean up 
 rm sample/Dockerfile sample/bin/aaf-cadi-aaf-${VERSION}-full.jar
+rm -Rf sample/CA
 cd -
+
 ########
 # Second, build a core Docker Image
 echo Building aaf_$AAF_COMPONENT...