summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
780da3e)
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) <balazs.szekeres@nokia.com>
%define COMPONENT elasticsearch
%define RPM_NAME caas-%{COMPONENT}
%define RPM_MAJOR_VERSION 7.1.1
%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}
%define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
Name: %{RPM_NAME}
RUN chown -R elasticsearch:elasticsearch /usr/share/elasticsearch /etc/logrotate.d/elasticsearch /usr/local/bin/healthcheck \
&& chmod +x /usr/share/elasticsearch/elasticsearch-setindex \
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"]
# workaround end
CMD ["elasticsearch"]