Using etc folder as a mounting point (#73)

Update branch to apply the template

CHANGELOG.md

@@ -1,9 +1,13 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## v3.x.x_6.x.x
+## Wazuh Docker v3.7.0_6.5.0
 
-## v3.7.0_6.4.3
+### Changed
+
+- Adapt to Elastic stack 6.5.0.
+
+## Wazuh Docker v3.7.0_6.4.3
 
 ### Added
 
@@ -23,6 +27,6 @@ All notable changes to this project will be documented in this file.
 - Fixed a bug that prevents the API from starting when the Wazuh manager was updated. Change in the files that are stored in the volume.  ([#65](https://github.com/wazuh/wazuh-docker/pull/65))
 - Fixed script reference ([#62](https://github.com/wazuh/wazuh-docker/pull/62/files))
 
-## v3.6.1_6.4.3
+## Wazuh Docker v3.6.1_6.4.3
 
 Wazuh-Docker starting point.

VERSION

@@ -1,2 +1,2 @@
-WAZUH-DOCKER_VERSION="3.7.0_6.4.3"
-REVISION="3700"
+WAZUH-DOCKER_VERSION="3.7.0_6.5.0"
+REVISION="3701"

docker-compose.yml

@@ -3,7 +3,7 @@ version: '2'
 
 services:
   wazuh:
-    image: wazuh/wazuh:3.7.0_6.4.3
+    image: wazuh/wazuh:3.7.0_6.5.0
     hostname: wazuh-manager
     restart: always
     ports:
@@ -23,7 +23,7 @@ services:
     depends_on:
       - logstash
   logstash:
-    image: wazuh/wazuh-logstash:3.7.0_6.4.3
+    image: wazuh/wazuh-logstash:3.7.0_6.5.0
     hostname: logstash
     restart: always
 #    volumes:
@@ -39,7 +39,7 @@ services:
     environment:
       - LS_HEAP_SIZE=2048m
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:6.4.3
+    image: docker.elastic.co/elasticsearch/elasticsearch:6.5.0
     hostname: elasticsearch
     restart: always
     ports:
@@ -61,7 +61,7 @@ services:
     networks:
         - docker_elk
   kibana:
-    image: wazuh/wazuh-kibana:3.7.0_6.4.3
+    image: wazuh/wazuh-kibana:3.7.0_6.5.0
     hostname: kibana
     restart: always
 #    ports:
@@ -76,7 +76,7 @@ services:
       - elasticsearch:elasticsearch
       - wazuh:wazuh
   nginx:
-    image: wazuh/wazuh-nginx:3.7.0_6.4.3
+    image: wazuh/wazuh-nginx:3.7.0_6.5.0
     hostname: nginx
     restart: always
     environment:

kibana/Dockerfile

@@ -1,11 +1,11 @@
 # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/kibana/kibana:6.4.3
-ARG WAZUH_APP_VERSION=3.7.0_6.4.3
+FROM docker.elastic.co/kibana/kibana:6.5.0
+ARG WAZUH_APP_VERSION=3.7.0_6.5.0
 USER root
 
 ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
 
-ADD https://raw.githubusercontent.com/wazuh/wazuh/3.6/extensions/elasticsearch/wazuh-elastic6-template-alerts.json /usr/share/kibana/config
+ADD https://raw.githubusercontent.com/wazuh/wazuh/3.7/extensions/elasticsearch/wazuh-elastic6-template-alerts.json /usr/share/kibana/config
 
 RUN NODE_OPTIONS="--max-old-space-size=3072" /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-${WAZUH_APP_VERSION}.zip &&\
     chown -R kibana:kibana /usr/share/kibana &&\

logstash/Dockerfile

@@ -1,5 +1,5 @@
 # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/logstash/logstash:6.4.3
+FROM docker.elastic.co/logstash/logstash:6.5.0
 
 RUN rm -f /usr/share/logstash/pipeline/logstash.conf
 

wazuh/Dockerfile

@@ -1,6 +1,6 @@
 # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
 FROM phusion/baseimage:latest
-ARG FILEBEAT_VERSION=6.4.3
+ARG FILEBEAT_VERSION=6.5.0
 ARG WAZUH_VERSION=3.7.0-1
 
 # Updating image

wazuh/config/data_dirs.env

@@ -1,16 +1,6 @@
 i=0
 DATA_DIRS[((i++))]="api/configuration"
-DATA_DIRS[((i++))]="etc/client.keys"
-DATA_DIRS[((i++))]="etc/decoders"
-DATA_DIRS[((i++))]="etc/lists"
-DATA_DIRS[((i++))]="etc/local_internal_options.conf"
-DATA_DIRS[((i++))]="etc/localtime"
-DATA_DIRS[((i++))]="etc/ossec.conf"
-DATA_DIRS[((i++))]="etc/rootcheck"
-DATA_DIRS[((i++))]="etc/rules"
-DATA_DIRS[((i++))]="etc/shared"
-DATA_DIRS[((i++))]="etc/sslmanager.cert"
-DATA_DIRS[((i++))]="etc/sslmanager.key"
+DATA_DIRS[((i++))]="etc"
 DATA_DIRS[((i++))]="logs"
 DATA_DIRS[((i++))]="queue/db"
 DATA_DIRS[((i++))]="queue/rootcheck"