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
/
aaf.sh
diff --git
a/auth/docker/aaf.sh
b/auth/docker/aaf.sh
index
3ed7eaf
..
b498428
100644
(file)
--- a/
auth/docker/aaf.sh
+++ b/
auth/docker/aaf.sh
@@
-22,14
+22,27
@@
. ./d.props
DOCKER=${DOCKER:=docker}
. ./d.props
DOCKER=${DOCKER:=docker}
+# if something, may not want CASS attached all the tim
+#LINKS="--link $CASSANDRA_DOCKER"
+
+# DOCKER doesn't have DNS out of the box, only links.
+# so we add cm_always_ignore_ips in --env
+
function run_it() {
function run_it() {
+ if [ -n "${DUSER}" ]; then
+ USER_LINE="--user ${DUSER}"
+ fi
$DOCKER run $@ \
$DOCKER run $@ \
+ $USER_LINE \
-v "aaf_config:$CONF_ROOT_DIR" \
-v "aaf_status:/opt/app/aaf/status" \
-v "aaf_config:$CONF_ROOT_DIR" \
-v "aaf_status:/opt/app/aaf/status" \
+ $LINKS \
--env aaf_locator_container=docker \
--env aaf_locator_container=docker \
+ --env aaf_locator_container_ns=${NAMESPACE} \
--env aaf_locator_fqdn=${HOSTNAME} \
--env aaf_locate_url=https://aaf-locate:8095 \
--env aaf_locator_fqdn=${HOSTNAME} \
--env aaf_locate_url=https://aaf-locate:8095 \
- --env aaf_locator_public_hostname=$HOSTNAME \
+ --env aaf_locator_public_fqdn=${HOSTNAME} \
+ --env cm_always_ignore_ips=true \
--env AAF_ENV=${AAF_ENV} \
--env LATITUDE=${LATITUDE} \
--env LONGITUDE=${LONGITUDE} \
--env AAF_ENV=${AAF_ENV} \
--env LATITUDE=${LATITUDE} \
--env LONGITUDE=${LONGITUDE} \