james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adup...@apache.org
Subject [1/7] james-project git commit: JAMES-2203 Upgrade mvn in docker
Date Mon, 30 Oct 2017 13:50:21 GMT
Repository: james-project
Updated Branches:
  refs/heads/master 9ed941188 -> 7c490edb8


JAMES-2203 Upgrade mvn in docker


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/14c0c6fa
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/14c0c6fa
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/14c0c6fa

Branch: refs/heads/master
Commit: 14c0c6faa5429d2df797a2c85abd25fd03d8b6d8
Parents: 6188456
Author: Antoine Duprat <aduprat@linagora.com>
Authored: Tue Oct 24 17:37:47 2017 +0200
Committer: Antoine Duprat <aduprat@linagora.com>
Committed: Wed Oct 25 10:53:02 2017 +0200

----------------------------------------------------------------------
 dockerfiles/site/website/Dockerfile | 8 ++++----
 dockerfiles/site/website/compile.sh | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/14c0c6fa/dockerfiles/site/website/Dockerfile
----------------------------------------------------------------------
diff --git a/dockerfiles/site/website/Dockerfile b/dockerfiles/site/website/Dockerfile
index 1bd3e76..d8a8a0b 100644
--- a/dockerfiles/site/website/Dockerfile
+++ b/dockerfiles/site/website/Dockerfile
@@ -2,13 +2,13 @@
 #
 # VERSION	1.0
 
-FROM java:openjdk-6-jdk
+FROM java:openjdk-8-jdk
 
 # Install Maven
 WORKDIR /root
-RUN wget http://mirrors.ircam.fr/pub/apache/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.tar.gz
-RUN tar -xvf apache-maven-3.2.5-bin.tar.gz
-RUN ln -s /root/apache-maven-3.2.5/bin/mvn /usr/bin/mvn
+RUN wget http://mirrors.ircam.fr/pub/apache/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.tar.gz
+RUN tar -xvf apache-maven-3.5.0-bin.tar.gz
+RUN ln -s /root/apache-maven-3.5.0/bin/mvn /usr/bin/mvn
 
 # Install git
 RUN apt-get update

http://git-wip-us.apache.org/repos/asf/james-project/blob/14c0c6fa/dockerfiles/site/website/compile.sh
----------------------------------------------------------------------
diff --git a/dockerfiles/site/website/compile.sh b/dockerfiles/site/website/compile.sh
index bd2a710..a8caa5c 100755
--- a/dockerfiles/site/website/compile.sh
+++ b/dockerfiles/site/website/compile.sh
@@ -39,7 +39,7 @@ git checkout $SHA1
 
 # Compilation
 
-export MAVEN_OPTS="-Xmx7168m -Xms2048m -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit"
+export MAVEN_OPTS="-Xmx7168m -Xms2048m -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit"
 
 mvn clean install -DskipTests
 mvn clean site:site -Dmaven.javadoc.skip=true


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message