This is an automated email from the ASF dual-hosted git repository.

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

commit f9eb15bbb0e4ce4d5b0166733ca9efc40699cb2f
Author: Benoit Tellier <[email protected]>
AuthorDate: Tue Feb 4 10:58:36 2020 +0700

    JAMES-3035 Switch to apache/tika:1.22 image
    
    See 
https://github.com/LogicalSpark/docker-tikaserver/issues/21#issuecomment-581365043
    for details
---
 JenkinsfileStressTests.groovy                                     | 2 +-
 README.adoc                                                       | 8 ++++----
 dockerfiles/run/docker-compose.yml                                | 2 +-
 .../src/main/java/org/apache/james/util/docker/Images.java        | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/JenkinsfileStressTests.groovy b/JenkinsfileStressTests.groovy
index 8950aea..38d7d10 100644
--- a/JenkinsfileStressTests.groovy
+++ b/JenkinsfileStressTests.groovy
@@ -57,7 +57,7 @@ pipeline {
                             sh "cd /srv && sudo btrfs subvolume snapshot 
bench-snapshot bench-running-docker"
                             sh 'docker run -d --name=cassandra -p 9042:9042 -v 
/srv/bench-running-docker/cassandra:/var/lib/cassandra cassandra:3.11.3'
                             sh 'docker run -d --name=elasticsearch -p 
9200:9200 -v 
/srv/bench-running-docker/elasticsearch:/usr/share/elasticsearch/data/elasticsearch
  --env "discovery.type=single-node" 
docker.elastic.co/elasticsearch/elasticsearch:6.3.2'
-                            sh 'docker run -d --name=tika 
linagora/docker-tikaserver:1.22'
+                            sh 'docker run -d --name=tika apache/tika:1.22'
                             sh 'docker run -d --name=swift -p 8080:8080 -v 
/srv/bench-running-docker/swift:/srv/1/node/sdb1 
jeantil/openstack-keystone-swift:pike'
                             sh 'docker run -d --name=rabbitmq -p 15672:15672 
-p 5672:5672 rabbitmq:3.8.1-management'
 
diff --git a/README.adoc b/README.adoc
index 3bb24da..3eb45f0 100644
--- a/README.adoc
+++ b/README.adoc
@@ -236,7 +236,7 @@ You need a running *ElasticSearch* in docker. To achieve 
this run:
 
 If you want to use all the JMAP search capabilities, you may also need to 
start Tika:
 
-    $ docker run -d --name=tika linagora/docker-tikaserver:1.22
+    $ docker run -d --name=tika apache/tika:1.22
 
 You can find more explanation on the need of Tika in this page 
http://james.apache.org/server/config-elasticsearch.html
 
@@ -287,7 +287,7 @@ You can handle attachment text extraction before indexing 
in ElasticSearch. This
 
 Run tika:
 
-    $ docker run --name tika linagora/docker-tikaserver:1.22
+    $ docker run --name tika apache/tika:1.22
 
 Add a link for the tika container in the above command line:
 
@@ -318,7 +318,7 @@ You need a running *ElasticSearch* in docker. To achieve 
this run:
 
 If you want to use all the JMAP search capabilities, you may also need to 
start Tika:
 
-    $ docker run -d --name=tika linagora/docker-tikaserver:1.22
+    $ docker run -d --name=tika apache/tika:1.22
 
 You can find more explanation on the need of Tika in this page 
http://james.apache.org/server/config-elasticsearch.html
 
@@ -350,7 +350,7 @@ You can handle attachment text extraction before indexing 
in ElasticSearch. This
 
 Run tika:
 
-    $ docker run --name tika linagora/docker-tikaserver:1.22
+    $ docker run --name tika apache/tika:1.22
 
 Add a link for the tika container in the above command line:
 
diff --git a/dockerfiles/run/docker-compose.yml 
b/dockerfiles/run/docker-compose.yml
index af11f01..a3aff78 100644
--- a/dockerfiles/run/docker-compose.yml
+++ b/dockerfiles/run/docker-compose.yml
@@ -34,7 +34,7 @@ services:
       - "9042:9042"
 
   tika:
-    image: linagora/docker-tikaserver:1.22
+    image: apache/tika:1.22
 
   rabbitmq:
     image: rabbitmq:3.8.1-management
diff --git 
a/server/testing/src/main/java/org/apache/james/util/docker/Images.java 
b/server/testing/src/main/java/org/apache/james/util/docker/Images.java
index 2464cbc..f880197 100644
--- a/server/testing/src/main/java/org/apache/james/util/docker/Images.java
+++ b/server/testing/src/main/java/org/apache/james/util/docker/Images.java
@@ -25,6 +25,6 @@ public interface Images {
     String ELASTICSEARCH_2 = "elasticsearch:2.4.6";
     String ELASTICSEARCH_6 = 
"docker.elastic.co/elasticsearch/elasticsearch:6.3.2";
     String NGINX = "nginx:1.15.1";
-    String TIKA = "linagora/docker-tikaserver:1.22";
+    String TIKA = "apache/tika:1.22";
     String SPAMASSASSIN = "dinkel/spamassassin:3.4.0";
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to