From 1824122afaa23b7254c778a28db6a71fb8fc927e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20=C5=81azarski?= <filip.lazarski@hltech.com>
Date: Thu, 21 May 2020 14:45:10 +0200
Subject: [PATCH] Adjusting memory options for JDK 11 and entrypoint script

---
 judge-d-agent/src/main/docker/Dockerfile     |  2 --
 judge-d-agent/src/main/docker/entrypoint.sh  |  7 +------
 judge-d-server/src/main/docker/entrypoint.sh | 20 +++++++-------------
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/judge-d-agent/src/main/docker/Dockerfile b/judge-d-agent/src/main/docker/Dockerfile
index 2fc87b1c..a278b8ad 100644
--- a/judge-d-agent/src/main/docker/Dockerfile
+++ b/judge-d-agent/src/main/docker/Dockerfile
@@ -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
diff --git a/judge-d-agent/src/main/docker/entrypoint.sh b/judge-d-agent/src/main/docker/entrypoint.sh
index 17cc81ba..baec7ae8 100644
--- a/judge-d-agent/src/main/docker/entrypoint.sh
+++ b/judge-d-agent/src/main/docker/entrypoint.sh
@@ -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
diff --git a/judge-d-server/src/main/docker/entrypoint.sh b/judge-d-server/src/main/docker/entrypoint.sh
index 2081e803..f9b2a943 100644
--- a/judge-d-server/src/main/docker/entrypoint.sh
+++ b/judge-d-server/src/main/docker/entrypoint.sh
@@ -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