diff options
Diffstat (limited to 'auth/docker')
| -rw-r--r-- | auth/docker/Dockerfile.client | 1 | ||||
| -rw-r--r-- | auth/docker/aaf.sh | 1 | ||||
| -rw-r--r-- | auth/docker/d.props.init | 1 | ||||
| -rwxr-xr-x | auth/docker/dbuild.sh | 9 | ||||
| -rw-r--r-- | auth/docker/drun.sh | 8 |
5 files changed, 14 insertions, 6 deletions
diff --git a/auth/docker/Dockerfile.client b/auth/docker/Dockerfile.client index 2ecf6a5d..3e61173d 100644 --- a/auth/docker/Dockerfile.client +++ b/auth/docker/Dockerfile.client @@ -8,6 +8,7 @@ LABEL version=${AAF_VERSION} COPY logs /opt/app/aaf_config/logs COPY bin/client.sh /opt/app/aaf_config/bin/agent.sh COPY bin/aaf-cadi*full.jar /opt/app/aaf_config/bin/ +COPY bin/aaf-cadi-servlet-sample-*-sample.jar /opt/app/aaf_config/bin/ COPY cert/*trust*.b64 /opt/app/aaf_config/cert/ ENTRYPOINT ["/bin/bash","/opt/app/aaf_config/bin/agent.sh"] diff --git a/auth/docker/aaf.sh b/auth/docker/aaf.sh index 7301c50e..29391597 100644 --- a/auth/docker/aaf.sh +++ b/auth/docker/aaf.sh @@ -13,6 +13,7 @@ function run_it() { --env HOSTNAME=${HOSTNAME} \ --env AAF_ENV=${AAF_ENV} \ --env AAF_REGISTER_AS=${AAF_REGISTER_AS} \ + --env AAF_LOCATOR_AS=${AAF_LOCATOR_AS} \ --env LATITUDE=${LATITUDE} \ --env LONGITUDE=${LONGITUDE} \ --env CASS_HOST=${CASS_HOST} \ diff --git a/auth/docker/d.props.init b/auth/docker/d.props.init index bde88c88..178d66f5 100644 --- a/auth/docker/d.props.init +++ b/auth/docker/d.props.init @@ -14,6 +14,7 @@ HOST_IP= # AAF Machine info AAF_ENV=DEV AAF_REGISTER_AS=$HOSTNAME +AAF_LOCATE_AS=$AAF_REGISTER_AS LATITUDE= LONGITUDE= diff --git a/auth/docker/dbuild.sh b/auth/docker/dbuild.sh index 2b6c006c..80427cef 100755 --- a/auth/docker/dbuild.sh +++ b/auth/docker/dbuild.sh @@ -29,6 +29,7 @@ $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}/latest +cp ../cadi/servlet-sample/target/aaf-cadi-servlet-sample-${VERSION}-sample.jar sample/bin # AAF Agent Image (for Clients) sed -e 's/${AAF_VERSION}/'${VERSION}'/g' -e 's/${AAF_COMPONENT}/'${AAF_COMPONENT}'/g' docker/Dockerfile.client > sample/Dockerfile $DOCKER build -t ${ORG}/${PROJECT}/aaf_agent:${VERSION} sample @@ -36,7 +37,7 @@ $DOCKER tag ${ORG}/${PROJECT}/aaf_agent:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/$ $DOCKER tag ${ORG}/${PROJECT}/aaf_agent:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_agent:latest # Clean up -rm sample/Dockerfile sample/bin/aaf-cadi-aaf-${VERSION}-full.jar +rm sample/Dockerfile sample/bin/aaf-cadi-aaf-${VERSION}-full.jar sample/bin/aaf-cadi-servlet-sample-${VERSION}-sample.jar rm -Rf sample/CA cd - @@ -52,8 +53,11 @@ $DOCKER tag ${ORG}/${PROJECT}/aaf_core:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${ rm aaf_${VERSION}/Dockerfile cd - +####### +# Do all the Containers related to AAF Services +####### if ["$1" == ""]; then - AAF_COMPONENTS=$(ls ../aaf_*HOT/bin | grep -v '\.') + AAF_COMPONENTS=$(ls ../aaf_${VERSION}/bin | grep -v '\.') else AAF_COMPONENTS=$1 fi @@ -69,6 +73,7 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do $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}/pod/* rmdir ../aaf_${VERSION}/pod diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh index be6795be..c6914a09 100644 --- a/auth/docker/drun.sh +++ b/auth/docker/drun.sh @@ -35,22 +35,22 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do case "$AAF_COMPONENT" in "service") PORTMAP="8100:8100" - LINKS="--link aaf_cass:cassandra --add-host=$CASS_HOST" + LINKS="--link aaf_cass:cassandra " ;; "locate") PORTMAP="8095:8095" - LINKS="--link aaf_cass:cassandra --add-host=$CASS_HOST" + LINKS="--link aaf_cass:cassandra " ;; "oauth") PORTMAP="8140:8140" - LINKS="--link aaf_cass:cassandra --add-host=$CASS_HOST" + LINKS="--link aaf_cass:cassandra " ;; "gui") PORTMAP="8200:8200" ;; "cm") PORTMAP="8150:8150" - LINKS="--link aaf_cass:cassandra --add-host=$CASS_HOST" + LINKS="--link aaf_cass:cassandra " ;; "hello") PORTMAP="8130:8130" |