Prepare for new builder-runner api

Author: CGNonofr

Dockerfile

@@ -1,8 +1,10 @@
-FROM codingame/java-compiler
+FROM codingame/maven3-builder
 
 # Copy files
-COPY target/junit-runner-0.0.1-SNAPSHOT-jar-with-dependencies.jar /usr/src/codingame/junit-runner/junit-runner.jar
+COPY target/java-maven3-junit4-runner-0.0.1-SNAPSHOT-jar-with-dependencies.jar /usr/src/codingame/junit-runner/junit-runner.jar
 COPY src/main/resources/junit-runner /usr/src/codingame/junit-runner/
 
+ENV CG_RUN_DIR /project/answer
 
 ENTRYPOINT ["/usr/src/codingame/junit-runner/junit-runner"]
+

pom.xml

@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.codingame.codemachine</groupId>
-	<artifactId>junit-runner</artifactId>
+	<artifactId>java-maven3-junit4-runner</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 
 	<properties>

src/main/resources/junit-runner

@@ -2,15 +2,18 @@
 compilationExitCode=0
 executionExitCode=0
 
-cd /project/answer
+JARS_DIR="/project/target/jars"
+WORKSPACE_DIR="/project/workspace"
 
-classpath=$(echo /project/target/*.jar | tr ' ' ':')
+cd ${CG_RUN_DIR}
 
-find * -name "*.java" -print0 | xargs -0 /usr/src/codingame/java-compiler/cgjavac -Xlint:all -cp "$classpath" -d /project/workspace
+classpath=$(echo ${JARS_DIR}/*.jar | tr ' ' ':')
+
+find * -name "*.java" -print0 | xargs -0 /usr/src/codingame/java-compiler/cgjavac -Xlint:all -cp "$classpath" -d "${WORKSPACE_DIR}"
 compilationExitCode=$?
 
 if [ $compilationExitCode -eq 0 ]; then
-	java -cp "/project/workspace:$classpath:/usr/src/codingame/junit-runner/junit-runner.jar" com.codingame.codemachine.runner.junit.JUnitTestListRunner $*
+	java -cp "${WORKSPACE_DIR}:$classpath:/usr/src/codingame/junit-runner/junit-runner.jar" com.codingame.codemachine.runner.junit.JUnitTestListRunner $*
 else
 	exit $compilationExitCode
-fi
+fi