Add jdk to docker-compose.

JetBrains · Jul 14, 2017 · fa1071e · fa1071e
1 parent 5057a69
commit fa1071e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile
@@ -3,3 +3,5 @@ FROM tomcat:8
 ADD conf/ /usr/local/tomcat/conf/
 
 RUN ["rm", "-r", "/usr/local/tomcat/webapps"]
+
+RUN apt-get update && apt-get install --assume-yes openjdk-8-jdk
diff --git a/docker/backend/conf/Catalina/localhost/ROOT.xml b/docker/backend/conf/Catalina/localhost/ROOT.xml
@@ -1,6 +1,6 @@
 <Context>
     <!-- All environment variables in this context are optional -->
-    <Environment name="java_execute" value="/docker-java-home/jre/bin/java" type="java.lang.String"
+    <Environment name="java_home" value="/usr/lib/jvm/java-8-openjdk-amd64" type="java.lang.String"
                  override="false"/>
     <Environment name="app_output_dir" value="/logs/" type="java.lang.String" override="false"/>
     <Environment name="timeout" type="java.lang.String" value="5000" override="false"/>