james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From btell...@apache.org
Subject [james-project] 06/08: JAMES-2767 Downgrading ES version to 6.3.2 in documentation
Date Wed, 05 Jun 2019 10:09:33 GMT
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit db86600514583e6db8a21317be035c80fc6d70ec
Author: Rene Cordier <rcordier@linagora.com>
AuthorDate: Tue Jun 4 16:51:21 2019 +0700

    JAMES-2767 Downgrading ES version to 6.3.2 in documentation
---
 JenkinsfileStressTests                                             | 2 +-
 README.adoc                                                        | 4 ++--
 dockerfiles/run/docker-compose.yml                                 | 2 +-
 src/site/markdown/server/install/guice-cassandra-rabbitmq-swift.md | 6 +++---
 src/site/markdown/server/install/guice-cassandra.md                | 6 +++---
 src/site/xdoc/server/quick-start-cassandra.xml                     | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/JenkinsfileStressTests b/JenkinsfileStressTests
index befc698..9bf9425 100644
--- a/JenkinsfileStressTests
+++ b/JenkinsfileStressTests
@@ -56,7 +56,7 @@ pipeline {
                     docker.withTool('docker') {
                         sh "docker run -d --name=cassandra cassandra:3.11.3"
                         sh "docker run -d --name=rabbitmq rabbitmq:3.7.7-management"
-                        sh "docker run -d --name=elasticsearch --env 'discovery.type=single-node'
elasticsearch:6.7.2"
+                        sh "docker run -d --name=elasticsearch --env 'discovery.type=single-node'
docker.elastic.co/elasticsearch/elasticsearch:6.3.2"
 
                         sh "docker run -d --hostname HOSTNAME -p 25:25 -p 8081:80 -p 110:110
-p 143:143 -p 465:465 -p 587:587 -p 993:993 --link cassandra:cassandra --link rabbitmq:rabbitmq
--link elasticsearch:elasticsearch --name james_run -t james_run"
                         try {
diff --git a/README.adoc b/README.adoc
index 0c9946e..8e0bd46 100644
--- a/README.adoc
+++ b/README.adoc
@@ -229,7 +229,7 @@ You need a running *swift* objectstorage in docker. To achieve this run:
 
 You need a running *ElasticSearch* in docker. To achieve this run:
 
-    $ docker run -d --name=elasticsearch --env 'discovery.type=single-node' elasticsearch:6.7.2
+    $ docker run -d --name=elasticsearch --env 'discovery.type=single-node' elasticsearch:6.3.2
 
 If you want to use all the JMAP search capabilities, you may also need to start Tika:
 
@@ -298,7 +298,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 --env 'discovery.type=single-node' elasticsearch:6.7.2
+    $ docker run -d --name=elasticsearch --env 'discovery.type=single-node' docker.elastic.co/elasticsearch/elasticsearch:6.3.2
 
 If you want to use all the JMAP search capabilities, you may also need to start Tika:
 
diff --git a/dockerfiles/run/docker-compose.yml b/dockerfiles/run/docker-compose.yml
index 3b847fb..814d930 100644
--- a/dockerfiles/run/docker-compose.yml
+++ b/dockerfiles/run/docker-compose.yml
@@ -23,7 +23,7 @@ services:
       - "993:993"
 
   elasticsearch:
-    image: elasticsearch:6.7.2
+    image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2
     environment:
       - discovery.type=single-node
 
diff --git a/src/site/markdown/server/install/guice-cassandra-rabbitmq-swift.md b/src/site/markdown/server/install/guice-cassandra-rabbitmq-swift.md
index 7f15a21..21a4a49 100644
--- a/src/site/markdown/server/install/guice-cassandra-rabbitmq-swift.md
+++ b/src/site/markdown/server/install/guice-cassandra-rabbitmq-swift.md
@@ -5,7 +5,7 @@
 ### Requirements
 
  - Java 8 SDK
- - Docker ∕ ElasticSearch 6.7.2, RabbitMQ Management 3.3.7, Swift ObjectStorage 2.15.1
and Cassandra 3.11.3
+ - Docker ∕ ElasticSearch 6.3.2, RabbitMQ Management 3.3.7, Swift ObjectStorage 2.15.1
and Cassandra 3.11.3
  - Maven 3
 
 ### Building the artifacts
@@ -26,7 +26,7 @@ mvn clean install
 ### Requirements
 
  * Cassandra 3.11.3
- * ElasticSearch 6.7.2
+ * ElasticSearch 6.3.2
  * RabbitMQ-Management 3.7.7
  * Swift ObjectStorage 2.15.1 or Scality S3 server or AWS S3
 
@@ -48,7 +48,7 @@ You need to have a Cassandra, ElasticSearch and RabbitMQ instance running.
You c
 
 ```bash
 $ docker run -d -p 9042:9042 --name=cassandra cassandra:3.11.3
-$ docker run -d -p 9200:9200 --name=elasticsearch --env 'discovery.type=single-node' elasticsearch:6.7.2
+$ docker run -d -p 9200:9200 --name=elasticsearch --env 'discovery.type=single-node' docker.elastic.co/elasticsearch/elasticsearch:6.3.2
 $ docker run -d -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:3.7.7-management
 $ docker run -d -p 5000:5000 -p 8080:8080 -p 35357:35357 --name=swift linagora/openstack-keystone-swift:pike
 ```
diff --git a/src/site/markdown/server/install/guice-cassandra.md b/src/site/markdown/server/install/guice-cassandra.md
index 564bd45..58956aa 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 6.7.2 and Cassandra 3.11.3
+ - Docker ∕ ElasticSearch 6.3.2 and Cassandra 3.11.3
  - Maven 3
 
 ### Building the artifacts
@@ -26,7 +26,7 @@ mvn clean install
 ### Requirements
 
  * Cassandra 3.11.3
- * ElasticSearch 6.7.2
+ * ElasticSearch 6.3.2
 
 ### James Launch
 
@@ -46,7 +46,7 @@ You need to have a Cassandra and an ElasticSearch instance running. You
can eith
 
 ```bash
 $ docker run -d -p 9042:9042 --name=cassandra cassandra:3.11.3
-$ docker run -d -p 9200:9200 --name=elasticsearch --env 'discovery.type=single-node' elasticsearch:6.7.2
+$ docker run -d -p 9200:9200 --name=elasticsearch --env 'discovery.type=single-node' docker.elastic.co/elasticsearch/elasticsearch:6.3.2
 ```
 
 Once everything is set up, you just have to run the jar with:
diff --git a/src/site/xdoc/server/quick-start-cassandra.xml b/src/site/xdoc/server/quick-start-cassandra.xml
index 1469f60..34811c4 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 --env 'discovery.type=single-node'
elasticsearch:6.7.2</i>
+<i>$ docker run --detach=true --name=elasticsearch --env 'discovery.type=single-node'
docker.elastic.co/elasticsearch/elasticsearch:6.3.2</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


Mime
View raw message