JAMES-2467 Recommend and use the last Cassandra version
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/771db643 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/771db643 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/771db643 Branch: refs/heads/master Commit: 771db6432aeb0ef1a64dce85805a7a093901f308 Parents: bbb7041 Author: Raphael Ouazana <[email protected]> Authored: Wed Jul 11 17:06:37 2018 +0200 Committer: Raphael Ouazana <[email protected]> Committed: Thu Jul 12 17:34:01 2018 +0200 ---------------------------------------------------------------------- README.adoc | 2 +- .../apache/james/backends/cassandra/DockerCassandraRule.java | 4 ++-- dockerfiles/run/docker-compose.yml | 2 +- src/site/markdown/server/install/guice-cassandra.md | 6 +++--- src/site/xdoc/server/quick-start-cassandra.xml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/771db643/README.adoc ---------------------------------------------------------------------- diff --git a/README.adoc b/README.adoc index fd03b41..71d5b34 100644 --- a/README.adoc +++ b/README.adoc @@ -215,7 +215,7 @@ If you haven't already: ==== How to ? You need a running *cassandra* in docker. To achieve this run: - $ docker run -d --name=cassandra cassandra:2.2.3 + $ docker run -d --name=cassandra cassandra:2.2.12 You need a running *ElasticSearch* in docker. To achieve this run: http://git-wip-us.apache.org/repos/asf/james-project/blob/771db643/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java index 38ca0eb..b31024b 100644 --- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java +++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java @@ -70,10 +70,10 @@ public class DockerCassandraRule implements TestRule { deleteTmpsFsCmd = client.removeVolumeCmd(tmpFsName); boolean deleteOnExit = false; cassandraContainer = new GenericContainer<>( - new ImageFromDockerfile("cassandra_2_2_10", deleteOnExit) + new ImageFromDockerfile("cassandra_2_2_12", deleteOnExit) .withDockerfileFromBuilder(builder -> builder - .from("cassandra:2.2.10") + .from("cassandra:2.2.12") .env("ENV CASSANDRA_CONFIG", "/etc/cassandra") //avoiding token range computation helps starting faster .run("echo \"JVM_OPTS=\\\"\\$JVM_OPTS -Dcassandra.initial_token=0\\\"\" >> " + CASSANDRA_ENV) http://git-wip-us.apache.org/repos/asf/james-project/blob/771db643/dockerfiles/run/docker-compose.yml ---------------------------------------------------------------------- diff --git a/dockerfiles/run/docker-compose.yml b/dockerfiles/run/docker-compose.yml index 154a14f..54170dd 100644 --- a/dockerfiles/run/docker-compose.yml +++ b/dockerfiles/run/docker-compose.yml @@ -24,7 +24,7 @@ services: image: elasticsearch:2.2.1 cassandra: - image: cassandra:2.2.3 + image: cassandra:2.2.12 ports: - "9042:9042" http://git-wip-us.apache.org/repos/asf/james-project/blob/771db643/src/site/markdown/server/install/guice-cassandra.md ---------------------------------------------------------------------- diff --git a/src/site/markdown/server/install/guice-cassandra.md b/src/site/markdown/server/install/guice-cassandra.md index 3729d1f..b451559 100644 --- a/src/site/markdown/server/install/guice-cassandra.md +++ b/src/site/markdown/server/install/guice-cassandra.md @@ -5,7 +5,7 @@ ### Requirements - Java 8 SDK - - Docker â ElasticSearch 2.2.1 and Cassandra 2.2.3 + - Docker â ElasticSearch 2.2.1 and Cassandra 2.2.12 - Maven 3 ### Building the artifacts @@ -45,7 +45,7 @@ $ keytool -genkey -alias james -keyalg RSA -keystore conf/keystore You need to have a Cassandra and an ElasticSearch instance running. You can either install the servers or launch them via docker: ```bash -$ docker run -d --port 9042:9042 --name=cassandra cassandra:2.2.3 +$ docker run -d --port 9042:9042 --name=cassandra cassandra:2.2.12 $ docker run -d --port 9200:9200 --port 9300:9300 --name=elasticsearch elasticsearch:2.2.1 ``` @@ -65,4 +65,4 @@ You can follow the same guide to build and run guice-cassandra-ldap artifact, ex ```bash $ java -Dworking.directory=. -jar target/james-server-cassandra-ldap-guice.jar -``` \ No newline at end of file +``` http://git-wip-us.apache.org/repos/asf/james-project/blob/771db643/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 c0ad8c1..96390ed 100644 --- a/src/site/xdoc/server/quick-start-cassandra.xml +++ b/src/site/xdoc/server/quick-start-cassandra.xml @@ -64,7 +64,7 @@ Step 3: Deploy 3.1. Deploy Cassandra (optional) You may skip this part if you already have a running Cassandra on your network. -<i>$ docker run --detach=true --name=cassandra cassandra:2.2.3</i> +<i>$ docker run --detach=true --name=cassandra cassandra:2.2.12</i> 3.2. Deploy ElasticSearch (optional) You may skip this part if you already have a running ElasticSearch on your network. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
