Merge remote-tracking branch 'origin/v1.0' into v1.0

antalbalint · Mar 8, 2017 · f64f0ee · f64f0ee
2 parents 1d9d015 + 89c28a1
commit f64f0ee
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 FROM centos:centos7
 MAINTAINER ome-devel@lists.openmicroscopy.org.uk
 
-ENV MAVEN_VERSION=3.0.5
+ENV MAVEN_VERSION=3.3.9
 
 RUN yum install -y java-1.8.0-openjdk-devel tar
 
@@ -18,6 +18,9 @@ RUN chown -R build:build /home/build/src
 
 USER build
 WORKDIR /home/build/src
+
+# mvn needs JAVA_HOME
+ENV JAVA_HOME /usr/lib/jvm/java
 RUN /opt/maven/bin/mvn install
 
 WORKDIR /mineotaur