X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=docker-build%2Felasticsearch%2FDockerfile;h=ab6d2095164692dc2d51c6a173ab3cbf58f6c629;hb=f0e0ff7d87fca007a03f476ce8a8a5d11d431177;hp=8a51bedbc41c2390804e87dcc2602f594d121c56;hpb=2bd006efc69ca0f607c68d6bd00dd6028e41f9fe;p=ta%2Fcaas-logging.git

diff --git a/docker-build/elasticsearch/Dockerfile b/docker-build/elasticsearch/Dockerfile
index 8a51bed..ab6d209 100644
--- a/docker-build/elasticsearch/Dockerfile
+++ b/docker-build/elasticsearch/Dockerfile
@@ -12,7 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM centos:7.6.1810
+FROM scratch
+ADD centos-7-docker.tar.xz /
+CMD ["/bin/bash"]
 MAINTAINER Levente Kale <levente.kale@nokia.com>
 
 ARG VERSION
@@ -21,7 +23,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
 
@@ -37,29 +39,13 @@ RUN groupadd -g 202 elasticsearch \
       supervisor \
 &&  yum clean all \
 &&  curl -fsSL ${ES_TARBAL} | tar zx --strip-components=1 \
-&&  echo "===> Creating Elasticsearch Paths..." \
-    && for path in \
-  	/usr/share/elasticsearch/data \
-  	/usr/share/elasticsearch/logs \
-  	/usr/share/elasticsearch/config \
-  	/usr/share/elasticsearch/config/scripts \
-  	/usr/share/elasticsearch/plugins \
-    ; do \
-        mkdir -p "$path"; \
-        chown -R elasticsearch:elasticsearch "$path"; \
-    done
-
-COPY config/elastic /usr/share/elasticsearch/config
-COPY config/logrotate /etc/logrotate.d/elasticsearch
-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 \
+&&  chown -R elasticsearch:elasticsearch /usr/share/elasticsearch \
 # 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
+&&  rm -rf /usr/share/elasticsearch/jdk \
 # workaround end
+&&  sed '/GC logging/Q' -i /usr/share/elasticsearch/config/jvm.options   # disable GC logging
 
-CMD ["elasticsearch"]
+COPY elasticsearch-logrotate.sh /etc/cron.hourly/
+COPY elasticsearch-setindex.sh /usr/share/elasticsearch/
+COPY log4j2.properties /usr/share/elasticsearch/config/