Code Review
/
aaf
/
authz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Examples.java-Extract the assignment out of the expression"
[aaf/authz.git]
/
auth
/
docker
/
drun.sh
diff --git
a/auth/docker/drun.sh
b/auth/docker/drun.sh
index
3266076
..
57a6167
100644
(file)
--- a/
auth/docker/drun.sh
+++ b/
auth/docker/drun.sh
@@
-61,7
+61,7
@@
for AAF_COMPONENT in ${AAF_COMPONENTS}; do
;;
"cm")
PUBLISH="--publish 8150:8150"
;;
"cm")
PUBLISH="--publish 8150:8150"
- LINKS="--link aaf-cass --link aaf-service --link aaf-locate"
+ LINKS="--link aaf-cass --link aaf-service --link aaf-locate
--link aaf-oauth
"
CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-cm aaf-locate && exec bin/cm"
;;
"gui")
CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-cm aaf-locate && exec bin/cm"
;;
"gui")
@@
-82,23
+82,22
@@
for AAF_COMPONENT in ${AAF_COMPONENTS}; do
esac
echo Starting aaf-$AAF_COMPONENT...
esac
echo Starting aaf-$AAF_COMPONENT...
+ if [ -n "${DUSER}" ]; then
+ THE_USER="--user $DUSER"
+ fi
- #for A in aaf.osaaf.org $AH_ROOT; do
- #ADD_HOST="$ADD_HOST --add-host=$A:$HOST_IP"
- #done
- #if [ ! -z "$LINKS" ] && [[ "$CASS_HOST" =~ ":" ]]; then
- #ADD_HOST="$ADD_HOST --add-host=$CASS_HOST"
- #fi
- #--hostname="${AAF_COMPONENT}.${NAMESPACE}" \
- # $ADD_HOST \
$DOCKER run \
-d \
$DOCKER run \
-d \
+ ${THE_USER} \
--name aaf-$AAF_COMPONENT \
${LINKS} \
--env AAF_ENV=${AAF_ENV} \
--env aaf_locator_container=docker \
--name aaf-$AAF_COMPONENT \
${LINKS} \
--env AAF_ENV=${AAF_ENV} \
--env aaf_locator_container=docker \
- --env aaf_locator_fqdn=$HOSTNAME \
+ --env aaf_locator_container_ns=${NAMESPACE} \
+ --env aaf_locator_fqdn=${HOSTNAME} \
+ --env aaf_locator_public_fqdn=${HOSTNAME} \
+ --env aaf_deployed_version=${VERSION} \
--env LATITUDE=${LATITUDE} \
--env LONGITUDE=${LONGITUDE} \
--env CASSANDRA_CLUSTER=${CASSANDRA_CLUSTER} \
--env LATITUDE=${LATITUDE} \
--env LONGITUDE=${LONGITUDE} \
--env CASSANDRA_CLUSTER=${CASSANDRA_CLUSTER} \
@@
-108,6
+107,6
@@
for AAF_COMPONENT in ${AAF_COMPONENTS}; do
$PUBLISH \
-v "aaf_config:$CONF_ROOT_DIR" \
-v "aaf_status:/opt/app/aaf/status" \
$PUBLISH \
-v "aaf_config:$CONF_ROOT_DIR" \
-v "aaf_status:/opt/app/aaf/status" \
- ${PREFIX}${ORG}/${PROJECT}/aaf_
${AAF_COMPONENT}
:${VERSION} \
+ ${PREFIX}${ORG}/${PROJECT}/aaf_
core
:${VERSION} \
/bin/bash -c "$CMD_LINE"
done
/bin/bash -c "$CMD_LINE"
done