tmp

.travis.yml

@@ -18,7 +18,7 @@ jobs:
         - mvn docker:build@build-docker -P docker-app -f ./judge-d-server/pom.xml
         - mvn docker:build@build-docker -P docker-app -f ./judge-d-agent/pom.xml
     - stage: build & publish docker image for server
-      if: branch = master AND NOT type IN (pull_request)
+#      if: branch = master AND NOT type IN (pull_request)
       script:
         - mvn docker:build@build-docker -P docker-app -f ./judge-d-server/pom.xml
         - echo "Pushing to docker registry"
@@ -29,7 +29,7 @@ jobs:
         - docker tag hltech/judge-d registry.heroku.com/judge-d/web
         - docker push registry.heroku.com/judge-d/web
     - stage: release app in heroku
-      if: branch = master AND NOT type IN (pull_request)
+#      if: branch = master AND NOT type IN (pull_request)
       script:
         - heroku container:release web -a judge-d
     - stage: build & publish docker image for agent

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

judge-d-agent/src/main/docker/entrypoint.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 java \
--XX:+UnlockExperimentalVMOptions \
--XX:+UseCGroupMemoryLimitForHeap \
+-XX:+UseContainerSupport \
 -XX:MaxRAMFraction=2 \
 -XshowSettings:vm \
 $* -jar judge-d-agent.jar

judge-d-server/src/main/docker/entrypoint.sh

@@ -1,18 +1,14 @@
-#!/bin/bash
+#!/bin/sh
 
-MEMORY_OPTIONS=" -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:MaxRAMFraction=2 -XshowSettings:vm "
-JAVA_OPTIONS=$MEMORY_OPTIONS
+MEMORY_OPTIONS="-XX:+UseContainerSupport -XX:MaxRAMFraction=2 -XshowSettings:vm "
 
-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 ${MEMORY_OPTIONS}${SWAGGER_OPTIONS} -jar judge-d.jar