Skip to content

Commit

Permalink
Adjusting memory options for JDK 11 and entrypoint script
Browse files Browse the repository at this point in the history
  • Loading branch information
Felipe444 committed May 21, 2020
1 parent a8c7b1b commit 1824122
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 21 deletions.
2 changes: 0 additions & 2 deletions judge-d-agent/src/main/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
FROM adoptopenjdk/openjdk11:alpine-slim



WORKDIR /root
ADD ./judge-d-agent-0.1-SNAPSHOT.jar /root/judge-d-agent.jar
ADD ./entrypoint.sh /root/entrypoint.sh
Expand Down
7 changes: 1 addition & 6 deletions judge-d-agent/src/main/docker/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
#!/bin/sh
java \
-XX:+UnlockExperimentalVMOptions \
-XX:+UseCGroupMemoryLimitForHeap \
-XX:MaxRAMFraction=2 \
-XshowSettings:vm \
$* -jar judge-d-agent.jar
java $* -jar judge-d-agent.jar
20 changes: 7 additions & 13 deletions judge-d-server/src/main/docker/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
#!/bin/bash
#!/bin/sh

MEMORY_OPTIONS=" -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:MaxRAMFraction=2 -XshowSettings:vm "
JAVA_OPTIONS=$MEMORY_OPTIONS

if [[ -v VALIDATION_OPTIONS ]]; then
echo "Selected validation options: $VALIDATION_OPTIONS"
validation_options_array=(${VALIDATION_OPTIONS//,/ })
validation_options_array_length=${#validation_options_array[@]}
for (( i=0; i<${validation_options_array_length}; i++ ));
do
validation_options_array[$i]="-Dswagger."${validation_options_array[$i]}
JAVA_OPTIONS+="${validation_options_array[$i]} "
if [[ -z "$VALIDATION_OPTIONS" ]]; then
echo "Selected validation options: ${VALIDATION_OPTIONS}"
validation_options_array=`echo ${VALIDATION_OPTIONS} | tr ',' ' '`
for i in ${validation_options_array}; do
SWAGGER_OPTIONS+=" -Dswagger."$i
done
fi

set -x
java $JAVA_OPTIONS -jar judge-d.jar
java ${SWAGGER_OPTIONS} -jar judge-d.jar

0 comments on commit 1824122

Please sign in to comment.