diff options
| author |   Sai Gandham <sai.gandham@att.com> | 2019-02-01 15:13:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-02-01 15:13:16 +0000 |
| commit | e36daf12cf4c5aa4b22fa3cec66a79ff2e2b8b94 (patch) | |
| tree | 76d8b5e81d853e33a06f86c4478f5616e83a1b51 /auth/docker | |
| parent | 73223229c68129715fcd7b0c9d128345f13b3b4d (diff) | |
| parent | 3505a52ac853c134ecaf40f2977667de8770ec59 (diff) | |
Merge "Implement public private locator"
Diffstat (limited to 'auth/docker')
| -rwxr-xr-x | auth/docker/dbuild.sh | 8 | ||||
| -rw-r--r-- | auth/docker/dclean.sh | 2 | ||||
| -rw-r--r-- | auth/docker/drun.sh | 2 | ||||
| -rw-r--r-- | auth/docker/dstop.sh | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/auth/docker/dbuild.sh b/auth/docker/dbuild.sh index 4eb349b9..924feea0 100755 --- a/auth/docker/dbuild.sh +++ b/auth/docker/dbuild.sh @@ -32,9 +32,9 @@ DOCKER=${DOCKER:=docker} echo "Building Containers for aaf components, version $VERSION" # AAF_cass now needs a version... -#cd ../auth-cass/docker -#bash ./dbuild.sh -#cd - +cd ../auth-cass/docker +bash ./dbuild.sh +cd - # AAF Base version - set the core image, etc sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \ @@ -57,7 +57,7 @@ sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \ docker/Dockerfile.config > sample/Dockerfile $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 +$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) diff --git a/auth/docker/dclean.sh b/auth/docker/dclean.sh index 38ce5189..4fb4e07a 100644 --- a/auth/docker/dclean.sh +++ b/auth/docker/dclean.sh @@ -23,7 +23,7 @@ DOCKER=${DOCKER:=docker} if [ "$1" == "" ]; then - AAF_COMPONENTS="$(cat components) config core agent" + AAF_COMPONENTS="$(cat components) config core agent " else AAF_COMPONENTS="$@" fi diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh index cdd8b3c4..32660760 100644 --- a/auth/docker/drun.sh +++ b/auth/docker/drun.sh @@ -71,7 +71,7 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do ;; "fs") PUBLISH="--publish 80:8096" - LINKS="" + LINKS="--link aaf-locate" CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-fs aaf-locate && exec bin/fs" ;; "hello") diff --git a/auth/docker/dstop.sh b/auth/docker/dstop.sh index 4d302bd1..256385d5 100644 --- a/auth/docker/dstop.sh +++ b/auth/docker/dstop.sh @@ -23,7 +23,7 @@ DOCKER=${DOCKER:=docker} if [ "$1" == "" ]; then - AAF_COMPONENTS=$(cat components) + AAF_COMPONENTS=$(tail -r components) else AAF_COMPONENTS="$@" fi |