yahoo_1999/fk-wazuh
1
0
Fork 0
forked from wazuh/wazuh-docker
Code Pull Requests Activity

Bump elasticsearch version

Browse Source
This commit is contained in:
Manuel Gutierrez
2020-01-09 18:18:28 +01:00
parent 5001a7d220
commit bfba87a4b0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
elasticsearch/Dockerfile
+2 -2
View File
@@ -1,5 +1,5 @@
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
ARG ELASTIC_VERSION=7.5.0 ARG ELASTIC_VERSION=7.5.1
FROM docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION} FROM docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION}
ARG S3_PLUGIN_URL="https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-${ELASTIC_VERSION}.zip" ARG S3_PLUGIN_URL="https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-${ELASTIC_VERSION}.zip"
@@ -15,7 +15,7 @@ ENV XPACK_ML="true"
ENV ENABLE_CONFIGURE_S3="false" ENV ENABLE_CONFIGURE_S3="false"
ARG TEMPLATE_VERSION=v3.10.2 ARG TEMPLATE_VERSION=v3.11.1
# Elasticearch cluster configuration environment variables # Elasticearch cluster configuration environment variables
# If ELASTIC_CLUSTER is set to "true" the following variables will be added to the Elasticsearch configuration # If ELASTIC_CLUSTER is set to "true" the following variables will be added to the Elasticsearch configuration
elasticsearch/config/config_cluster.sh
+1 -1
View File
@@ -13,7 +13,7 @@ remove_cluster_config(){
sed -i '/# cluster node/,/# end cluster config/d' $1 sed -i '/# cluster node/,/# end cluster config/d' $1
} }
# If Elasticsearch cluster is enable, then set up the elasticsearch.yml # If Elasticsearch cluster is enabled, then set up the elasticsearch.yml
if [[ $ELASTIC_CLUSTER == "true" && $CLUSTER_NODE_MASTER != "" && $CLUSTER_NODE_DATA != "" && $CLUSTER_NODE_INGEST != "" && $CLUSTER_MASTER_NODE_NAME != "" ]]; then if [[ $ELASTIC_CLUSTER == "true" && $CLUSTER_NODE_MASTER != "" && $CLUSTER_NODE_DATA != "" && $CLUSTER_NODE_INGEST != "" && $CLUSTER_MASTER_NODE_NAME != "" ]]; then
# Remove the old configuration # Remove the old configuration
remove_single_node_conf $elastic_config_file remove_single_node_conf $elastic_config_file