summaryrefslogtreecommitdiffstats
path: root/auth/docker
diff options
context:
space:
mode:
authorJonathan Gathman <jonathan.gathman@att.com>2019-02-18 16:14:39 +0000
committerGerrit Code Review <gerrit@onap.org>2019-02-18 16:14:39 +0000
commita6be2293d445881c447b7f8534e382f0d767a3bc (patch)
treedb49eb10b9f04690247a93cae7861753566f1e56 /auth/docker
parent502e3991f592b334f8ffb12780eccebbbaf2e261 (diff)
parent7f1e2c062e9ddb722e3ec79b432888e9f9dbc81e (diff)
Merge "Refine Agent.sh and Docs"
Diffstat (limited to 'auth/docker')
-rw-r--r--auth/docker/Dockerfile.client2
-rw-r--r--auth/docker/Dockerfile.config2
-rw-r--r--auth/docker/agent.sh15
3 files changed, 13 insertions, 6 deletions
diff --git a/auth/docker/Dockerfile.client b/auth/docker/Dockerfile.client
index e50810fe..111c3774 100644
--- a/auth/docker/Dockerfile.client
+++ b/auth/docker/Dockerfile.client
@@ -25,10 +25,10 @@ ENV VERSION=${AAF_VERSION}
LABEL description="aaf_agent"
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-auth-cmd-${AAF_VERSION}-full.jar /opt/app/aaf_config/bin/
COPY bin/aaf-cadi-servlet-sample-*-sample.jar /opt/app/aaf_config/bin/
+COPY logs /opt/app/aaf_config/logs
COPY cert/*trust*.b64 /opt/app/aaf_config/cert/
RUN if [ -n "${DUSER}" ]; then chown -R ${DUSER}:${DUSER} /opt/app/aaf_config; fi
diff --git a/auth/docker/Dockerfile.config b/auth/docker/Dockerfile.config
index 9a5fbb47..7e442b2a 100644
--- a/auth/docker/Dockerfile.config
+++ b/auth/docker/Dockerfile.config
@@ -28,10 +28,10 @@ LABEL version=${AAF_VERSION}
COPY data/sample.identities.dat /opt/app/aaf_config/data/
COPY etc /opt/app/aaf_config/etc
COPY local /opt/app/aaf_config/local
+COPY logs /opt/app/aaf_config/logs
COPY cert /opt/app/aaf_config/cert
COPY public /opt/app/aaf_config/public
COPY CA /opt/app/aaf_config/CA
-COPY logs /opt/app/aaf_config/logs
COPY bin/service.sh /opt/app/aaf_config/bin/agent.sh
COPY bin/pod_wait.sh /opt/app/aaf_config/bin/
COPY bin/aaf-auth-cmd-${AAF_VERSION}-full.jar /opt/app/aaf_config/bin/
diff --git a/auth/docker/agent.sh b/auth/docker/agent.sh
index a2b11830..c330b1ce 100644
--- a/auth/docker/agent.sh
+++ b/auth/docker/agent.sh
@@ -36,7 +36,7 @@ for V in VERSION DOCKER_REPOSITORY HOSTNAME AAF_FQDN AAF_FQDN_IP DEPLOY_FQI APP_
case $V in
DOCKER_REPOSITORY)
PROMPT="Docker Repo"
- DEF=""
+ DEF="nexus3.onap.org:10003"
;;
HOSTNAME)
PROMPT="HOSTNAME (blank for Default)"
@@ -47,7 +47,12 @@ for V in VERSION DOCKER_REPOSITORY HOSTNAME AAF_FQDN AAF_FQDN_IP DEPLOY_FQI APP_
AAF_FQDN_IP)
# Need AAF_FQDN's IP, because not might not be available in mini-container
PROMPT="AAF FQDN IP"
- DEF=$(host $AAF_FQDN | grep "has address" | tail -1 | cut -f 4 -d ' ')
+ LOOKUP=$(host "${AAF_FQDN}" | grep "has address")
+ if [ -z ${LOOKUP} ]; then
+ DEF=
+ else
+ DEF=$(echo ${LOOKUP} | tail -1 | cut -f 4 -d ' ')
+ fi
;;
APP_FQI) PROMPT="App's FQI";;
APP_FQDN) PROMPT="App's Root FQDN";;
@@ -74,6 +79,7 @@ for V in VERSION DOCKER_REPOSITORY HOSTNAME AAF_FQDN AAF_FQDN_IP DEPLOY_FQI APP_
fi
fi
echo "$V=$VAR" >> ./aaf.props
+ declare "$V"="$VAR"
fi
done
. ./aaf.props
@@ -91,7 +97,6 @@ else
fi
function run_it() {
- LINKS="--link aaf-locate"
if [ -n "${DUSER}" ]; then
USER_LINE="--user ${DUSER}"
fi
@@ -99,7 +104,6 @@ function run_it() {
${USER_LINE} \
-v "${VOLUME}:/opt/app/osaaf" \
--add-host="$AAF_FQDN:$AAF_FQDN_IP" \
- $LINKS \
--env AAF_FQDN=${AAF_FQDN} \
--env DEPLOY_FQI=${DEPLOY_FQI} \
--env DEPLOY_PASSWORD=${DEPLOY_PASSWORD} \
@@ -118,6 +122,9 @@ case "$1" in
PARAMS="&& cd /opt/app/osaaf/local && exec bash"
run_it -it --rm
;;
+ taillog)
+ run_it -it --rm
+ ;;
*)
run_it --rm
;;