From 4adb9741e4ad3b27463600cf886361dd666da45d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20=C3=81ngel?= Date: Tue, 14 May 2019 15:02:50 +0200 Subject: [PATCH] Do not add template in Elasticsearch Dockerfile --- elasticsearch/Dockerfile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 25e6e30b..111ddf21 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -1,5 +1,5 @@ -# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) -FROM docker.elastic.co/elasticsearch/elasticsearch:6.7.2 +# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) +FROM docker.elastic.co/elasticsearch/elasticsearch:7.0.0 ENV ELASTICSEARCH_URL="http://elasticsearch:9200" @@ -13,8 +13,6 @@ ENV XPACK_ML="true" ENV ENABLE_CONFIGURE_S3="false" -ENV TEMPLATE_VERSION=v3.9.0 - # Elasticearch cluster configuration environment variables # If ELASTIC_CLUSTER is set to "true" the following variables will be added to the Elasticsearch configuration ENV ELASTIC_CLUSTER="false" \ @@ -29,8 +27,6 @@ ENV ELASTIC_CLUSTER="false" \ CLUSTER_MAX_NODES="1" \ CLUSTER_DELAYED_TIMEOUT="1m" -ADD https://raw.githubusercontent.com/wazuh/wazuh/$TEMPLATE_VERSION/extensions/elasticsearch/wazuh-elastic6-template-alerts.json /usr/share/elasticsearch/config - COPY config/entrypoint.sh /entrypoint.sh RUN chmod 755 /entrypoint.sh @@ -39,7 +35,7 @@ COPY --chown=elasticsearch:elasticsearch ./config/load_settings.sh ./ RUN chmod +x ./load_settings.sh -RUN bin/elasticsearch-plugin install --batch https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-6.7.2.zip +RUN bin/elasticsearch-plugin install --batch https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-7.0.0.zip COPY config/configure_s3.sh ./config/configure_s3.sh RUN chmod 755 ./config/configure_s3.sh