From 895cd72a962de1868151288d4df1510db5280fab Mon Sep 17 00:00:00 2001 From: abatos Date: Fri, 9 Jun 2017 09:14:33 -0400 Subject: [PATCH] Configurable max heap size and PID fix Change-Id: I9db736bd124b9ffba96a7aa307e82f1b1f74de30 Signed-off-by: abatos --- .gitignore | 4 ++++ src/main/bin/start.sh | 3 ++- src/main/docker/Dockerfile | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a33cfa5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/target/ +/bin/ +.project +.settings/ \ No newline at end of file diff --git a/src/main/bin/start.sh b/src/main/bin/start.sh index ea3f8bd..efe866a 100644 --- a/src/main/bin/start.sh +++ b/src/main/bin/start.sh @@ -34,7 +34,8 @@ PROPS="$PROPS -DAJSC_SERVICE_NAMESPACE=search-data-service" PROPS="$PROPS -DAJSC_SERVICE_VERSION=v1" PROPS="$PROPS -Dserver.port=9509" PROPS="$PROPS -DCONFIG_HOME=$CONFIG_HOME" +JVM_MAX_HEAP=${MAX_HEAP:-1024} echo $CLASSPATH -java -Xms1024m -Xmx4096m -XX:PermSize=2024m $PROPS -classpath $CLASSPATH com.att.ajsc.runner.Runner context=// sslport=9509 +exec java -Xmx${JVM_MAX_HEAP}m $PROPS -classpath $CLASSPATH com.att.ajsc.runner.Runner context=// sslport=9509 diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index 6182c35..3198bb1 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -23,4 +23,4 @@ RUN ln -s /logs $MICRO_HOME/logs EXPOSE 9509 9509 -CMD /opt/app/search-data-service/bin/start.sh +CMD ["/opt/app/search-data-service/bin/start.sh"] -- 2.16.6