diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 9b54b1bb7c9b28390d1c66e57473b357eff14d1f..83b01f0446d808543adb13f5be840b5bf6c61788 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -5,7 +5,7 @@ MAINTAINER pjpires@gmail.com # Override config, otherwise plug-in install will fail ADD config /elasticsearch/config -ADD elasticsearch /elasticsearch/plugins/elasticsearch +ADD plugins/analysis-ik /elasticsearch/plugins/analysis-ik # Set environment ENV DISCOVERY_SERVICE elasticsearch-discovery diff --git a/elasticsearch/elasticsearch/commons-codec-1.9.jar b/elasticsearch/plugins/analysis-ik/commons-codec-1.9.jar similarity index 100% rename from elasticsearch/elasticsearch/commons-codec-1.9.jar rename to elasticsearch/plugins/analysis-ik/commons-codec-1.9.jar diff --git a/elasticsearch/elasticsearch/commons-logging-1.2.jar b/elasticsearch/plugins/analysis-ik/commons-logging-1.2.jar similarity index 100% rename from elasticsearch/elasticsearch/commons-logging-1.2.jar rename to elasticsearch/plugins/analysis-ik/commons-logging-1.2.jar diff --git a/elasticsearch/elasticsearch/config/IKAnalyzer.cfg.xml b/elasticsearch/plugins/analysis-ik/config/IKAnalyzer.cfg.xml similarity index 100% rename from elasticsearch/elasticsearch/config/IKAnalyzer.cfg.xml rename to elasticsearch/plugins/analysis-ik/config/IKAnalyzer.cfg.xml diff --git a/elasticsearch/elasticsearch/config/extra_main.dic b/elasticsearch/plugins/analysis-ik/config/extra_main.dic similarity index 100% rename from elasticsearch/elasticsearch/config/extra_main.dic rename to elasticsearch/plugins/analysis-ik/config/extra_main.dic diff --git a/elasticsearch/elasticsearch/config/extra_single_word.dic b/elasticsearch/plugins/analysis-ik/config/extra_single_word.dic similarity index 100% rename from elasticsearch/elasticsearch/config/extra_single_word.dic rename to elasticsearch/plugins/analysis-ik/config/extra_single_word.dic diff --git a/elasticsearch/elasticsearch/config/extra_single_word_full.dic b/elasticsearch/plugins/analysis-ik/config/extra_single_word_full.dic similarity index 100% rename from elasticsearch/elasticsearch/config/extra_single_word_full.dic rename to elasticsearch/plugins/analysis-ik/config/extra_single_word_full.dic diff --git a/elasticsearch/elasticsearch/config/extra_single_word_low_freq.dic b/elasticsearch/plugins/analysis-ik/config/extra_single_word_low_freq.dic similarity index 100% rename from elasticsearch/elasticsearch/config/extra_single_word_low_freq.dic rename to elasticsearch/plugins/analysis-ik/config/extra_single_word_low_freq.dic diff --git a/elasticsearch/elasticsearch/config/extra_stopword.dic b/elasticsearch/plugins/analysis-ik/config/extra_stopword.dic similarity index 100% rename from elasticsearch/elasticsearch/config/extra_stopword.dic rename to elasticsearch/plugins/analysis-ik/config/extra_stopword.dic diff --git a/elasticsearch/elasticsearch/config/main.dic b/elasticsearch/plugins/analysis-ik/config/main.dic similarity index 100% rename from elasticsearch/elasticsearch/config/main.dic rename to elasticsearch/plugins/analysis-ik/config/main.dic diff --git a/elasticsearch/elasticsearch/config/preposition.dic b/elasticsearch/plugins/analysis-ik/config/preposition.dic similarity index 100% rename from elasticsearch/elasticsearch/config/preposition.dic rename to elasticsearch/plugins/analysis-ik/config/preposition.dic diff --git a/elasticsearch/elasticsearch/config/quantifier.dic b/elasticsearch/plugins/analysis-ik/config/quantifier.dic similarity index 100% rename from elasticsearch/elasticsearch/config/quantifier.dic rename to elasticsearch/plugins/analysis-ik/config/quantifier.dic diff --git a/elasticsearch/elasticsearch/config/stopword.dic b/elasticsearch/plugins/analysis-ik/config/stopword.dic similarity index 100% rename from elasticsearch/elasticsearch/config/stopword.dic rename to elasticsearch/plugins/analysis-ik/config/stopword.dic diff --git a/elasticsearch/elasticsearch/config/suffix.dic b/elasticsearch/plugins/analysis-ik/config/suffix.dic similarity index 100% rename from elasticsearch/elasticsearch/config/suffix.dic rename to elasticsearch/plugins/analysis-ik/config/suffix.dic diff --git a/elasticsearch/elasticsearch/config/surname.dic b/elasticsearch/plugins/analysis-ik/config/surname.dic similarity index 100% rename from elasticsearch/elasticsearch/config/surname.dic rename to elasticsearch/plugins/analysis-ik/config/surname.dic diff --git a/elasticsearch/elasticsearch/elasticsearch-analysis-ik-6.2.4.jar b/elasticsearch/plugins/analysis-ik/elasticsearch-analysis-ik-6.2.4.jar similarity index 100% rename from elasticsearch/elasticsearch/elasticsearch-analysis-ik-6.2.4.jar rename to elasticsearch/plugins/analysis-ik/elasticsearch-analysis-ik-6.2.4.jar diff --git a/elasticsearch/elasticsearch/httpclient-4.5.2.jar b/elasticsearch/plugins/analysis-ik/httpclient-4.5.2.jar similarity index 100% rename from elasticsearch/elasticsearch/httpclient-4.5.2.jar rename to elasticsearch/plugins/analysis-ik/httpclient-4.5.2.jar diff --git a/elasticsearch/elasticsearch/httpcore-4.4.4.jar b/elasticsearch/plugins/analysis-ik/httpcore-4.4.4.jar similarity index 100% rename from elasticsearch/elasticsearch/httpcore-4.4.4.jar rename to elasticsearch/plugins/analysis-ik/httpcore-4.4.4.jar diff --git a/elasticsearch/elasticsearch/plugin-descriptor.properties b/elasticsearch/plugins/analysis-ik/plugin-descriptor.properties similarity index 100% rename from elasticsearch/elasticsearch/plugin-descriptor.properties rename to elasticsearch/plugins/analysis-ik/plugin-descriptor.properties