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
Add Servlet Sample
[aaf/authz.git]
/
auth
/
docker
/
aaf.sh
diff --git
a/auth/docker/aaf.sh
b/auth/docker/aaf.sh
index
a54c54a
..
2939159
100644
(file)
--- a/
auth/docker/aaf.sh
+++ b/
auth/docker/aaf.sh
@@
-1,16
+1,45
@@
#!/bin/bash
. ./d.props
#!/bin/bash
. ./d.props
+if [ -e ./cass.props ]; then
+ . ./cass.props
+fi
-docker run \
- -it \
-
--rm
\
- -
-mount 'type=volume,src=aaf_config,dst='$CONF_ROOT_DIR',volume-driver=local'
\
+DOCKER=${DOCKER:=docker}
+function run_it() {
+
$DOCKER run $@
\
+ -
v "aaf_config:$CONF_ROOT_DIR"
\
--add-host="$HOSTNAME:$HOST_IP" \
--add-host="aaf.osaaf.org:$HOST_IP" \
--add-host="$HOSTNAME:$HOST_IP" \
--add-host="aaf.osaaf.org:$HOST_IP" \
+ --env HOSTNAME=${HOSTNAME} \
--env AAF_ENV=${AAF_ENV} \
--env AAF_REGISTER_AS=${AAF_REGISTER_AS} \
--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 LATITUDE=${LATITUDE} \
--env LONGITUDE=${LONGITUDE} \
+ --env CASS_HOST=${CASS_HOST} \
+ --env CASSANDRA_CLUSTER=${CASSANDRA_CLUSTER} \
+ --env CASSANDRA_USER=${CASSANDRA_USER} \
+ --env CASSANDRA_PASSWORD=${CASSANDRA_PASSWORD} \
+ --env CASSANDRA_PORT=${CASSANDRA_PORT} \
--name aaf_config_$USER \
$PREFIX${ORG}/${PROJECT}/aaf_config:${VERSION} \
--name aaf_config_$USER \
$PREFIX${ORG}/${PROJECT}/aaf_config:${VERSION} \
- /bin/bash "$@"
+ /bin/bash $PARAMS
+}
+
+function set_prop() {
+ $DOCKER exec -t aaf_config_$USER /bin/bash /opt/app/aaf_config/bin/agent.sh NOOP setProp "$1" "$2" "$3"
+}
+
+function encrypt_it() {
+ $DOCKER exec -t aaf_config_$USER /bin/bash /opt/app/aaf_config/bin/agent.sh NOOP encrypt "$1" "$2"
+}
+
+function set_it() {
+ $DOCKER exec -t aaf_config_$USER /bin/bash /opt/app/aaf_config/bin/agent.sh NOOP setProp "$1" "$2"
+}
+
+PARAMS="$@"
+if [ "$PARAMS" != "" ]; then
+ run_it -it --rm
+fi
+