From 2bd006efc69ca0f607c68d6bd00dd6028e41f9fe Mon Sep 17 00:00:00 2001 From: "Szekeres, Balazs (Nokia - HU/Budapest)" Date: Wed, 26 Jun 2019 10:21:18 +0200 Subject: [PATCH] Elastic slimming Removed the jdk which is provided by elasticsearch. Hardlinked modules to the plugins folder (instead of copy). Elastic minor version bumped. Change-Id: I06d045102f05469868ada949ebe6251117bc8218 Signed-off-by: Szekeres, Balazs (Nokia - HU/Budapest) --- SPECS/elasticsearch.spec | 2 +- docker-build/elasticsearch/Dockerfile | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/SPECS/elasticsearch.spec b/SPECS/elasticsearch.spec index b7a61d3..928a972 100644 --- a/SPECS/elasticsearch.spec +++ b/SPECS/elasticsearch.spec @@ -15,7 +15,7 @@ %define COMPONENT elasticsearch %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 7.1.1 -%define RPM_MINOR_VERSION 0 +%define RPM_MINOR_VERSION 1 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} Name: %{RPM_NAME} diff --git a/docker-build/elasticsearch/Dockerfile b/docker-build/elasticsearch/Dockerfile index a67b12d..8a51bed 100644 --- a/docker-build/elasticsearch/Dockerfile +++ b/docker-build/elasticsearch/Dockerfile @@ -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"] -- 2.16.6