You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2018/07/24 02:51:36 UTC
[1/7] james-project git commit: JAMES-2490 Upgrade software installed
in Dockerfiles
Repository: james-project
Updated Branches:
refs/heads/master fb8ac9a02 -> 42536465e
JAMES-2490 Upgrade software installed in Dockerfiles
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/89bc85f2
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/89bc85f2
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/89bc85f2
Branch: refs/heads/master
Commit: 89bc85f2f94c864fef09e2168b6cb2823289f4fc
Parents: f7414bb
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 23 15:17:29 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Tue Jul 24 09:49:58 2018 +0700
----------------------------------------------------------------------
dockerfiles/compilation/java-8/Dockerfile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/89bc85f2/dockerfiles/compilation/java-8/Dockerfile
----------------------------------------------------------------------
diff --git a/dockerfiles/compilation/java-8/Dockerfile b/dockerfiles/compilation/java-8/Dockerfile
index 45502a5..b94bc84 100644
--- a/dockerfiles/compilation/java-8/Dockerfile
+++ b/dockerfiles/compilation/java-8/Dockerfile
@@ -4,13 +4,13 @@
FROM openjdk:8u171-jdk
-ENV GIT_VERSION 1:2.1.4-2.1
+ENV GIT_VERSION 1:2.11.0-3
# Install Maven
WORKDIR /root
-RUN wget https://archive.apache.org/dist/maven/maven-3/3.5.3/binaries/apache-maven-3.5.3-bin.tar.gz
-RUN tar -xvf apache-maven-3.5.3-bin.tar.gz
-RUN ln -s /root/apache-maven-3.5.3/bin/mvn /usr/bin/mvn
+RUN wget https://archive.apache.org/dist/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.tar.gz
+RUN tar -xvf apache-maven-3.5.4-bin.tar.gz
+RUN ln -s /root/apache-maven-3.5.4/bin/mvn /usr/bin/mvn
# Install git
RUN apt-get update
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[4/7] james-project git commit: JAMES-2490 Upgrade images mentioned
in the website
Posted by bt...@apache.org.
JAMES-2490 Upgrade images mentioned in the website
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f7414bbc
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f7414bbc
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f7414bbc
Branch: refs/heads/master
Commit: f7414bbc426f4b29288fff331356e2a8d10acca4
Parents: ec66b40
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 23 12:53:42 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Tue Jul 24 09:49:58 2018 +0700
----------------------------------------------------------------------
src/site/xdoc/server/quick-start-cassandra.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/f7414bbc/src/site/xdoc/server/quick-start-cassandra.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/server/quick-start-cassandra.xml b/src/site/xdoc/server/quick-start-cassandra.xml
index 96390ed..a76e4b4 100644
--- a/src/site/xdoc/server/quick-start-cassandra.xml
+++ b/src/site/xdoc/server/quick-start-cassandra.xml
@@ -69,7 +69,7 @@ You may skip this part if you already have a running Cassandra on your network.
3.2. Deploy ElasticSearch (optional)
You may skip this part if you already have a running ElasticSearch on your network.
-<i>$ docker run --detach=true --name=elasticsearch elasticsearch:2.2.1</i>
+<i>$ docker run --detach=true --name=elasticsearch elasticsearch:2.4.6</i>
Step 4: Configure
#################
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[3/7] james-project git commit: JAMES-2490 Upgrade docker images used
in Tests
Posted by bt...@apache.org.
JAMES-2490 Upgrade docker images used in Tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d623b738
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d623b738
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d623b738
Branch: refs/heads/master
Commit: d623b738896aef05f08c82c5e4a71004497f5820
Parents: fb8ac9a
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 23 12:47:57 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Tue Jul 24 09:49:58 2018 +0700
----------------------------------------------------------------------
.../src/test/java/org/apache/james/util/docker/Images.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/d623b738/server/container/util-java8/src/test/java/org/apache/james/util/docker/Images.java
----------------------------------------------------------------------
diff --git a/server/container/util-java8/src/test/java/org/apache/james/util/docker/Images.java b/server/container/util-java8/src/test/java/org/apache/james/util/docker/Images.java
index d0da2aa..c252f1a 100644
--- a/server/container/util-java8/src/test/java/org/apache/james/util/docker/Images.java
+++ b/server/container/util-java8/src/test/java/org/apache/james/util/docker/Images.java
@@ -21,9 +21,9 @@ package org.apache.james.util.docker;
public interface Images {
String FAKE_SMTP = "weave/rest-smtp-sink:latest";
- String RABBITMQ = "rabbitmq:3.7.5";
- String ELASTICSEARCH = "elasticsearch:2.2.2";
- String NGINX = "nginx:1.7.1";
+ String RABBITMQ = "rabbitmq:3.7.7";
+ String ELASTICSEARCH = "elasticsearch:2.4.6";
+ String NGINX = "nginx:1.15.1";
String TIKA = "linagora/docker-tikaserver:1.18-SNAPSHOT-plus-TIKA-2520";
String SPAMASSASSIN = "dinkel/spamassassin:3.4.0";
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[7/7] james-project git commit: JAMES-2477 Allow passing additional
arguments to maven dockerized build
Posted by bt...@apache.org.
JAMES-2477 Allow passing additional arguments to maven dockerized build
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/42536465
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/42536465
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/42536465
Branch: refs/heads/master
Commit: 42536465ef5a0e83ecb24478860baa99a0c6a661
Parents: e124259
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 23 13:53:41 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Tue Jul 24 09:50:44 2018 +0700
----------------------------------------------------------------------
dockerfiles/compilation/java-8/compile.sh | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/42536465/dockerfiles/compilation/java-8/compile.sh
----------------------------------------------------------------------
diff --git a/dockerfiles/compilation/java-8/compile.sh b/dockerfiles/compilation/java-8/compile.sh
index 3300aad..954e78a 100755
--- a/dockerfiles/compilation/java-8/compile.sh
+++ b/dockerfiles/compilation/java-8/compile.sh
@@ -6,6 +6,9 @@ printUsage() {
echo "./compile.sh [-s | --skipTests] SHA1"
echo " -s: Skip test"
echo " SHA1: SHA1 to build (optional)"
+ echo ""
+ echo "Environment:"
+ echo " - MVN_ADDITIONAL_ARG_LINE: Allow passing additional command arguments to the maven command"
exit 1
}
@@ -47,9 +50,9 @@ git checkout $SHA1
# Compilation
if [ "$SKIPTESTS" = "skipTests" ]; then
- mvn package -DskipTests
+ mvn package -DskipTests ${MVN_ADDITIONAL_ARG_LINE}
else
- mvn package
+ mvn package ${MVN_ADDITIONAL_ARG_LINE}
fi
# Retrieve result
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[6/7] james-project git commit: JAMES-2491 Upgrade Guice to 4.1.0
Posted by bt...@apache.org.
JAMES-2491 Upgrade Guice to 4.1.0
Newer guice 4.2.0 depends on Guava 23.6
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/e1242596
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/e1242596
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/e1242596
Branch: refs/heads/master
Commit: e12425968f6a66321465e644eca237028a9d9bcf
Parents: 89bc85f
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 23 13:45:51 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Tue Jul 24 09:50:16 2018 +0700
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/e1242596/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 71a0e85..6455434 100644
--- a/pom.xml
+++ b/pom.xml
@@ -662,7 +662,7 @@
<mockito-core.version>1.9.0</mockito-core.version>
<jasypt.version>1.9.0</jasypt.version>
<jackson-databinding.version>2.6.3</jackson-databinding.version>
- <guice.version>4.0</guice.version>
+ <guice.version>4.1.0</guice.version>
<jackrabbit-core.version>2.5.2</jackrabbit-core.version>
<logback.version>1.1.11</logback.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/7] james-project git commit: JAMES-2490 Upgrade packaged
dockerfiles
Posted by bt...@apache.org.
JAMES-2490 Upgrade packaged dockerfiles
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c4ec1af2
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c4ec1af2
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c4ec1af2
Branch: refs/heads/master
Commit: c4ec1af2bc27aa442cbf1f9d2c069b560cd3fc1a
Parents: d623b73
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 23 12:49:09 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Tue Jul 24 09:49:58 2018 +0700
----------------------------------------------------------------------
dockerfiles/compilation/java-8/Dockerfile | 2 +-
dockerfiles/merge/Dockerfile | 2 +-
dockerfiles/packaging/guice/cassandra/Dockerfile | 2 +-
dockerfiles/run/docker-compose.yml | 2 +-
dockerfiles/run/guice/cassandra-ldap/Dockerfile | 2 +-
dockerfiles/run/guice/cassandra/Dockerfile | 2 +-
dockerfiles/run/guice/jpa/Dockerfile | 2 +-
dockerfiles/run/spring/Dockerfile | 2 +-
dockerfiles/site/website/Dockerfile | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/c4ec1af2/dockerfiles/compilation/java-8/Dockerfile
----------------------------------------------------------------------
diff --git a/dockerfiles/compilation/java-8/Dockerfile b/dockerfiles/compilation/java-8/Dockerfile
index a4148d8..45502a5 100644
--- a/dockerfiles/compilation/java-8/Dockerfile
+++ b/dockerfiles/compilation/java-8/Dockerfile
@@ -2,7 +2,7 @@
#
# VERSION 1.0
-FROM openjdk:8u141-jdk
+FROM openjdk:8u171-jdk
ENV GIT_VERSION 1:2.1.4-2.1
http://git-wip-us.apache.org/repos/asf/james-project/blob/c4ec1af2/dockerfiles/merge/Dockerfile
----------------------------------------------------------------------
diff --git a/dockerfiles/merge/Dockerfile b/dockerfiles/merge/Dockerfile
index a62b6d0..b1a7ca3 100644
--- a/dockerfiles/merge/Dockerfile
+++ b/dockerfiles/merge/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:8.1
+FROM debian:8.11
RUN apt-get update
RUN apt-get install -y git
http://git-wip-us.apache.org/repos/asf/james-project/blob/c4ec1af2/dockerfiles/packaging/guice/cassandra/Dockerfile
----------------------------------------------------------------------
diff --git a/dockerfiles/packaging/guice/cassandra/Dockerfile b/dockerfiles/packaging/guice/cassandra/Dockerfile
index e7d0b0f..e9e416d 100644
--- a/dockerfiles/packaging/guice/cassandra/Dockerfile
+++ b/dockerfiles/packaging/guice/cassandra/Dockerfile
@@ -4,7 +4,7 @@ ARG TAG=latest
FROM ${BASE}:${TAG} as source
FROM ${BASE_LDAP}:${TAG} as sourceLdap
-FROM debian:8.1
+FROM debian:8.11
RUN apt-get update
RUN apt-get install -y ruby-dev ruby build-essential
http://git-wip-us.apache.org/repos/asf/james-project/blob/c4ec1af2/dockerfiles/run/docker-compose.yml
----------------------------------------------------------------------
diff --git a/dockerfiles/run/docker-compose.yml b/dockerfiles/run/docker-compose.yml
index 54170dd..5080702 100644
--- a/dockerfiles/run/docker-compose.yml
+++ b/dockerfiles/run/docker-compose.yml
@@ -21,7 +21,7 @@ services:
- "993:993"
elasticsearch:
- image: elasticsearch:2.2.1
+ image: elasticsearch:2.4.6
cassandra:
image: cassandra:2.2.12
http://git-wip-us.apache.org/repos/asf/james-project/blob/c4ec1af2/dockerfiles/run/guice/cassandra-ldap/Dockerfile
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra-ldap/Dockerfile b/dockerfiles/run/guice/cassandra-ldap/Dockerfile
index e87e5f5..d80fb7b 100644
--- a/dockerfiles/run/guice/cassandra-ldap/Dockerfile
+++ b/dockerfiles/run/guice/cassandra-ldap/Dockerfile
@@ -2,7 +2,7 @@
#
# VERSION 1.0
-FROM openjdk:8u141-jdk
+FROM openjdk:8u171-jdk
# Ports that are used
#
http://git-wip-us.apache.org/repos/asf/james-project/blob/c4ec1af2/dockerfiles/run/guice/cassandra/Dockerfile
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra/Dockerfile b/dockerfiles/run/guice/cassandra/Dockerfile
index f643626..c112839 100644
--- a/dockerfiles/run/guice/cassandra/Dockerfile
+++ b/dockerfiles/run/guice/cassandra/Dockerfile
@@ -2,7 +2,7 @@
#
# VERSION 1.0
-FROM openjdk:8u141-jdk
+FROM openjdk:8u171-jdk
# Ports that are used
#
http://git-wip-us.apache.org/repos/asf/james-project/blob/c4ec1af2/dockerfiles/run/guice/jpa/Dockerfile
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/jpa/Dockerfile b/dockerfiles/run/guice/jpa/Dockerfile
index d8f3d35..bb2e68d 100644
--- a/dockerfiles/run/guice/jpa/Dockerfile
+++ b/dockerfiles/run/guice/jpa/Dockerfile
@@ -2,7 +2,7 @@
#
# VERSION 1.0
-FROM openjdk:8u141-jdk
+FROM openjdk:8u171-jdk
# Ports that are used
#
http://git-wip-us.apache.org/repos/asf/james-project/blob/c4ec1af2/dockerfiles/run/spring/Dockerfile
----------------------------------------------------------------------
diff --git a/dockerfiles/run/spring/Dockerfile b/dockerfiles/run/spring/Dockerfile
index ee904c9..c6106bd 100644
--- a/dockerfiles/run/spring/Dockerfile
+++ b/dockerfiles/run/spring/Dockerfile
@@ -2,7 +2,7 @@
#
# VERSION 1.0
-FROM openjdk:8u141-jdk
+FROM openjdk:8u171-jdk
# Ports that are used
#
http://git-wip-us.apache.org/repos/asf/james-project/blob/c4ec1af2/dockerfiles/site/website/Dockerfile
----------------------------------------------------------------------
diff --git a/dockerfiles/site/website/Dockerfile b/dockerfiles/site/website/Dockerfile
index a92a62b..2c53af7 100644
--- a/dockerfiles/site/website/Dockerfile
+++ b/dockerfiles/site/website/Dockerfile
@@ -2,7 +2,7 @@
#
# VERSION 1.0
-FROM java:openjdk-8-jdk
+FROM openjdk:8u171-jdk
# Install Maven
WORKDIR /root
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[5/7] james-project git commit: JAMES-2490 Upgrade images mentionned
in the README
Posted by bt...@apache.org.
JAMES-2490 Upgrade images mentionned in the README
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ec66b40d
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ec66b40d
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ec66b40d
Branch: refs/heads/master
Commit: ec66b40dbebbcad6d9a98abf294f1bc0a2f4c34f
Parents: c4ec1af
Author: benwa <bt...@linagora.com>
Authored: Mon Jul 23 12:52:04 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Tue Jul 24 09:49:58 2018 +0700
----------------------------------------------------------------------
README.adoc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/ec66b40d/README.adoc
----------------------------------------------------------------------
diff --git a/README.adoc b/README.adoc
index 71d5b34..8cdf0c3 100644
--- a/README.adoc
+++ b/README.adoc
@@ -107,7 +107,7 @@ You need to build the homepage by:
In order to test the homepage, you can use this command:
- $ docker run --rm -v $PWD/site:/srv/jekyll -p 4000:4000 -it jekyll/minimal:3.5 jekyll serve
+ $ docker run --rm -v $PWD/site:/srv/jekyll -p 4000:4000 -it jekyll/minimal:3.8.3 jekyll serve
the site will be available at http://localhost:4000/
@@ -219,7 +219,7 @@ You need a running *cassandra* in docker. To achieve this run:
You need a running *ElasticSearch* in docker. To achieve this run:
- $ docker run -d --name=elasticsearch elasticsearch:2.2.1
+ $ docker run -d --name=elasticsearch elasticsearch:2.4.6
If you want to use all the JMAP search capabilities, you may also need to start Tika:
@@ -255,7 +255,7 @@ You can handle attachment text extraction before indexing in ElasticSearch. This
Run tika:
- $ docker run --name tika logicalspark/docker-tikaserver:1.15rc2
+ $ docker run --name tika linagora/docker-tikaserver:1.18-SNAPSHOT-plus-TIKA-2520
Add a link for the tika container in the above command line:
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org