diff options
author | Phillip Leigh <phillip.leigh@amdocs.com> | 2020-01-06 10:48:47 -0500 |
---|---|---|
committer | Phillip Leigh <phillip.leigh@amdocs.com> | 2020-01-08 10:20:31 -0500 |
commit | 8ff4f944df28f3adb28c2a305cd45fffa79fc4c5 (patch) | |
tree | 281284803697d85f23e00e365e85e0ef7be75e07 /search-data-service-app/src | |
parent | 9c2b439f5046d730866264ec0174fe64450d5cc8 (diff) |
Update AAI Search-data-service from AEE develop branch to ONAP master
Issue-ID: AAI-2741
Signed-off-by: Phillip Leigh <phillip.leigh@amdocs.com>
Change-Id: I93c8c8c224884340d65ad00bfc5d61b2196b0a71
Diffstat (limited to 'search-data-service-app/src')
-rw-r--r-- | search-data-service-app/src/main/bin/start.sh | 7 | ||||
-rw-r--r-- | search-data-service-app/src/main/docker/Dockerfile | 11 |
2 files changed, 13 insertions, 5 deletions
diff --git a/search-data-service-app/src/main/bin/start.sh b/search-data-service-app/src/main/bin/start.sh index 7f81ee9..ec7788d 100644 --- a/search-data-service-app/src/main/bin/start.sh +++ b/search-data-service-app/src/main/bin/start.sh @@ -14,6 +14,7 @@ if [ -z "$KEY_STORE_PASSWORD" ]; then exit 1 fi + # Changes related to:AAI-2179 # Change aai search-data container processes to run as non-root on the host USER_ID=${LOCAL_USER_ID:-9001} @@ -32,13 +33,14 @@ if [ $(cat /etc/passwd | grep aaiadmin | wc -l) -eq 0 ]; then } fi; +chmod -R 0755 ${MICRO_HOME} chown -R aaiadmin:aaiadmin ${MICRO_HOME} chown -R aaiadmin:aaiadmin ${AJSC_HOME} chown -R aaiadmin:aaiadmin ${SD_LOGS} find ${MICRO_HOME} -name "*.sh" -exec chmod +x {} + -gosu aaiadmin ln -s /logs $MICRO_HOME/logs +gosu aaiadmin ln -snf /logs $MICRO_HOME/logs JAVA_CMD="exec gosu aaiadmin java"; ### PROPS="-DAJSC_HOME=$AJSC_HOME" @@ -56,5 +58,6 @@ if [ ! -z "$TRUST_STORE_LOCATION" ]; then fi JVM_MAX_HEAP=${MAX_HEAP:-1024} +JVM_MIN_HEAP=${JVM_MAX_HEAP} -${JAVA_CMD} $PROPS -jar $BASEDIR/search-data-service-package.jar +${JAVA_CMD} -Xms${JVM_MIN_HEAP}m -Xmx${JVM_MAX_HEAP}m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/onap $PROPS -jar $BASEDIR/search-data-service-app.jar diff --git a/search-data-service-app/src/main/docker/Dockerfile b/search-data-service-app/src/main/docker/Dockerfile index d5cda35..5284e5b 100644 --- a/search-data-service-app/src/main/docker/Dockerfile +++ b/search-data-service-app/src/main/docker/Dockerfile @@ -33,9 +33,14 @@ fi # Build up the deployment folder structure RUN mkdir -p $MICRO_HOME $USERS_HOME /logs WORKDIR $MICRO_HOME -COPY /maven/@project.artifactId@/ . -RUN chmod 755 $BIN_HOME/* \ - && ln -snf /logs $MICRO_HOME/logs +RUN mkdir -p $MICRO_HOME/bundleconfig/etc +ADD search-data-service* $MICRO_HOME/ +RUN mkdir -p $BIN_HOME +COPY *.sh $BIN_HOME +COPY bundleconfig-local $MICRO_HOME/bundleconfig +COPY bundleconfig-local/etc/logback.xml $MICRO_HOME/bundleconfig/etc +RUN chmod -R 755 $BIN_HOME/* $MICRO_HOME/* +RUN ln -snf /logs $MICRO_HOME/logs EXPOSE 9509 9509 |