X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=docker-build%2Felasticsearch%2FDockerfile;h=ad8edab47ecb39546316acb22543f84df15dad0c;hb=refs%2Fchanges%2F14%2F1114%2F1;hp=a67b12d97e391ea6c03899a1b982d489d9809809;hpb=2df5333cd7c52ffa6f63591dd4f7e1dbdeb0db58;p=ta%2Fcaas-logging.git diff --git a/docker-build/elasticsearch/Dockerfile b/docker-build/elasticsearch/Dockerfile index a67b12d..ad8edab 100644 --- a/docker-build/elasticsearch/Dockerfile +++ b/docker-build/elasticsearch/Dockerfile @@ -21,7 +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}-linux-x86_64.tar.gz" +ENV ES_TARBAL "${DOWNLOAD_URL}/elasticsearch-oss-${ES_VERSION}-linux-x86_64.tar.gz" WORKDIR /usr/share/elasticsearch @@ -56,9 +56,10 @@ 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 \ -# workaround for Elasticsearch: this way ES can list the used plugins -&& cp -a /usr/share/elasticsearch/modules/* /usr/share/elasticsearch/plugins/ \ -&& chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/plugins +# 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"]