summaryrefslogtreecommitdiffstats
path: root/auth/docker/dbuild.sh
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2019-04-03 08:25:28 -0500
committerInstrumental <jonathan.gathman@att.com>2019-04-03 08:47:50 -0500
commitbd7def7ee2098af56ce66752f59c062d7923fb69 (patch)
treec896c416126f6ffc24bf5addf5b8f03704f68260 /auth/docker/dbuild.sh
parent4fb5572210ac353ab9cf6edd55cc45a5d0381cd4 (diff)
Create Helm based Certificates for Clients
Issue-ID: AAF-802 Change-Id: I5fdc4daecd6bac7f042940473784cfb05c9e338e Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth/docker/dbuild.sh')
-rwxr-xr-xauth/docker/dbuild.sh24
1 files changed, 18 insertions, 6 deletions
diff --git a/auth/docker/dbuild.sh b/auth/docker/dbuild.sh
index b2a5d510..1b4e5eee 100755
--- a/auth/docker/dbuild.sh
+++ b/auth/docker/dbuild.sh
@@ -76,7 +76,6 @@ 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' \
@@ -93,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
@@ -113,6 +112,9 @@ 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
@@ -123,24 +125,34 @@ cd -
# Do all the Containers related to AAF Services
#######
if [ $AAF_COMPONENTS == "ALL" ]; then
- AAF_COMPONENTS=$(ls ../aaf_${VERSION}/bin | grep -v '\.')
+ AAF_COMPONENTS=$(cat components)
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...
+ if [ "hello" = "${AAF_COMPONENT}" ]; then
+ echo Building Hello separately
+ DF="Dockerfile.hello"
+ cp -Rf ../sample/etc ../aaf_${VERSION}/etc
+ else
+ DF="Dockerfile.ms"
+ fi
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
+ $DF >../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
+ if [ -e aaf_${VERSION}/etc ]; then
+ rm -Rf aaf_${VERSION}/etc
+ fi
cd -
-
done
+
+# Final cleanup
rm ../aaf_${VERSION}/bin/pod_wait.sh