X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=docker-build%2Felasticsearch%2FDockerfile;h=8a51bedbc41c2390804e87dcc2602f594d121c56;hb=refs%2Fchanges%2F55%2F1055%2F5;hp=ed0043a917d03db3eca4f782e4206baad5b62a26;hpb=229e54ec0c45ee7389247cf6cda79d31b303de85;p=ta%2Fcaas-logging.git

diff --git a/docker-build/elasticsearch/Dockerfile b/docker-build/elasticsearch/Dockerfile
index ed0043a..8a51bed 100644
--- a/docker-build/elasticsearch/Dockerfile
+++ b/docker-build/elasticsearch/Dockerfile
@@ -21,9 +21,7 @@ ENV ES_VERSION=$VERSION
 ENV PATH /usr/share/elasticsearch/bin:$PATH
 ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk
 ENV DOWNLOAD_URL "https://artifacts.elastic.co/downloads/elasticsearch"
-ENV ES_TARBAL "${DOWNLOAD_URL}/elasticsearch-${ES_VERSION}.tar.gz"
-ENV ES_TARBALL_ASC "${DOWNLOAD_URL}/elasticsearch-${ES_VERSION}.tar.gz.asc"
-ENV EXPECTED_SHA_URL "${DOWNLOAD_URL}/elasticsearch-${ES_VERSION}.tar.gz.sha512"
+ENV ES_TARBAL "${DOWNLOAD_URL}/elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz"
 
 WORKDIR /usr/share/elasticsearch
 
@@ -57,6 +55,11 @@ COPY healthcheck /usr/local/bin/
 COPY elasticsearch-setindex /usr/share/elasticsearch
 
 RUN chown -R elasticsearch:elasticsearch /usr/share/elasticsearch /etc/logrotate.d/elasticsearch /usr/local/bin/healthcheck \
-&&  chmod +x /usr/share/elasticsearch/elasticsearch-setindex
+&&  chmod +x /usr/share/elasticsearch/elasticsearch-setindex \
+# workaround for Elasticsearch: this way ES can list the used plugins, and remove the jdk folder (open jdk slimmer)
+&&  cp -al /usr/share/elasticsearch/modules/* /usr/share/elasticsearch/plugins/ \
+&&  chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/plugins \
+&&  rm -rf /usr/share/elasticsearch/jdk
+# workaround end
 
 CMD ["elasticsearch"]