diff options
| author |   Kajur, Harish (vk250x) <vk250x@att.com> | 2019-01-13 12:18:00 -0500 |
|---|---|---|
| committer | Kajur, Harish (vk250x) <vk250x@att.com> | 2019-01-13 12:18:07 -0500 |
| commit | 3289e79a0f0343cbd380a385d61e21f59ceff85c (patch) | |
| tree | a74957c74fb41275aede412e5c43307fd3e0c859 /aai-resources/src/main/docker/docker-entrypoint.sh | |
| parent | 92ac3a80c822340c07b9d09189b85c34ac797122 (diff) | |
Sync up the changes for v15
Issue-ID: AAI-1811
Change-Id: I5c397d5907bb0711977f62ba84abe454f410a3b7
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
Diffstat (limited to 'aai-resources/src/main/docker/docker-entrypoint.sh')
| -rw-r--r-- | aai-resources/src/main/docker/docker-entrypoint.sh | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/aai-resources/src/main/docker/docker-entrypoint.sh b/aai-resources/src/main/docker/docker-entrypoint.sh index 1d6e7b8..d2fe989 100644 --- a/aai-resources/src/main/docker/docker-entrypoint.sh +++ b/aai-resources/src/main/docker/docker-entrypoint.sh @@ -38,7 +38,7 @@ if [ $(cat /etc/passwd | grep aaiadmin | wc -l) -eq 0 ]; then } fi; -chown -R aaiadmin:aaiadmin /opt/app /opt/aai/logroot +chown -R aaiadmin:aaiadmin /opt/app /opt/aai/logroot /opt/bulkprocess_load find /opt/app/ -name "*.sh" -exec chmod +x {} + if [ -f ${APP_HOME}/aai.sh ]; then @@ -67,6 +67,13 @@ if [ -f ${APP_HOME}/aai.sh ]; then exit 0; fi; + if [ ! -f ${APP_HOME}/scripts/updatePem.sh ]; then + echo "Unable to find the updatePem script"; + exit 1; + else + gosu aaiadmin ${APP_HOME}/scripts/updatePem.sh + fi; + fi; mkdir -p /opt/app/aai-resources/logs/gc @@ -117,12 +124,16 @@ JVM_OPTS="${JVM_OPTS} -Dsun.net.inetaddr.ttl=180"; JVM_OPTS="${JVM_OPTS} -XX:+HeapDumpOnOutOfMemoryError"; JVM_OPTS="${JVM_OPTS} ${POST_JVM_ARGS}"; JAVA_OPTS="${PRE_JAVA_OPTS} -DAJSC_HOME=$APP_HOME"; +if [ -f ${INTROSCOPE_LIB}/Agent.jar ] && [ -f ${INTROSCOPE_AGENTPROFILE} ]; then + JAVA_OPTS="${JAVA_OPTS} -javaagent:${INTROSCOPE_LIB}/Agent.jar -noverify -Dcom.wily.introscope.agentProfile=${INTROSCOPE_AGENTPROFILE} -Dintroscope.agent.agentName=resources" +fi JAVA_OPTS="${JAVA_OPTS} -Dserver.port=${SERVER_PORT}"; JAVA_OPTS="${JAVA_OPTS} -DBUNDLECONFIG_DIR=./resources"; JAVA_OPTS="${JAVA_OPTS} -Dserver.local.startpath=${RESOURCES_HOME}"; JAVA_OPTS="${JAVA_OPTS} -DAAI_CHEF_ENV=${AAI_CHEF_ENV}"; JAVA_OPTS="${JAVA_OPTS} -DSCLD_ENV=${SCLD_ENV}"; JAVA_OPTS="${JAVA_OPTS} -DAFT_ENVIRONMENT=${AFT_ENVIRONMENT}"; +JAVA_OPTS="${JAVA_OPTS} -DlrmName=com.att.ajsc.aai-resources"; JAVA_OPTS="${JAVA_OPTS} -DAAI_BUILD_VERSION=${AAI_BUILD_VERSION}"; JAVA_OPTS="${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom"; JAVA_OPTS="${JAVA_OPTS} -Dlogback.configurationFile=./resources/logback.xml"; |