From a441251d1a424a7cc65237fee79c42e4526a6621 Mon Sep 17 00:00:00 2001
From: Vikman Fernandez-Castro <victor@wazuh.com>
Date: Sun, 11 Nov 2018 13:26:01 +0100
Subject: [PATCH] Update to Wazuh 3.7.0 and Elastic 6.4.3

---
 README.md           |  2 +-
 docker-compose.yml  | 10 +++++-----
 kibana/Dockerfile   |  4 ++--
 logstash/Dockerfile |  2 +-
 wazuh/Dockerfile    |  4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index ea6d5f4b..ca997d37 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ In addition, a docker-compose file is provided to launch the containers mentione
 
 ## Current release
 
-Containers are currently tested on Wazuh version 3.6.1 and Elastic Stack version 6.4.2. We will do our best to keep this repository updated to latest versions of both Wazuh and Elastic Stack.
+Containers are currently tested on Wazuh version 3.7.0 and Elastic Stack version 6.4.3. We will do our best to keep this repository updated to latest versions of both Wazuh and Elastic Stack.
 
 ## Installation notes
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 617f79d8..e910c6f3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2'
 
 services:
   wazuh:
-    image: wazuh/wazuh:3.6.1_6.4.2
+    image: wazuh/wazuh:3.7.0_6.4.3
     hostname: wazuh-manager
     restart: always
     ports:
@@ -23,7 +23,7 @@ services:
     depends_on:
       - logstash
   logstash:
-    image: wazuh/wazuh-logstash:3.6.1_6.4.2
+    image: wazuh/wazuh-logstash:3.7.0_6.4.3
     hostname: logstash
     restart: always
 #    volumes:
@@ -39,7 +39,7 @@ services:
     environment:
       - LS_HEAP_SIZE=2048m
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:6.4.2
+    image: docker.elastic.co/elasticsearch/elasticsearch:6.4.3
     hostname: elasticsearch
     restart: always
     ports:
@@ -61,7 +61,7 @@ services:
     networks:
         - docker_elk
   kibana:
-    image: wazuh/wazuh-kibana:3.6.1_6.4.2
+    image: wazuh/wazuh-kibana:3.7.0_6.4.3
     hostname: kibana
     restart: always
 #    ports:
@@ -76,7 +76,7 @@ services:
       - elasticsearch:elasticsearch
       - wazuh:wazuh
   nginx:
-    image: wazuh/wazuh-nginx:3.6.1_6.4.2
+    image: wazuh/wazuh-nginx:3.7.0_6.4.3
     hostname: nginx
     restart: always
     environment:
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index 916602c8..07301fdb 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,6 +1,6 @@
 # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/kibana/kibana:6.4.2
-ARG WAZUH_APP_VERSION=3.6.1_6.4.2
+FROM docker.elastic.co/kibana/kibana:6.4.3
+ARG WAZUH_APP_VERSION=3.7.0_6.4.3
 USER root
 
 ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
diff --git a/logstash/Dockerfile b/logstash/Dockerfile
index 9274dd19..b601c611 100644
--- a/logstash/Dockerfile
+++ b/logstash/Dockerfile
@@ -1,5 +1,5 @@
 # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/logstash/logstash:6.4.2
+FROM docker.elastic.co/logstash/logstash:6.4.3
 
 RUN rm -f /usr/share/logstash/pipeline/logstash.conf
 
diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile
index 47d63c84..5b636813 100644
--- a/wazuh/Dockerfile
+++ b/wazuh/Dockerfile
@@ -1,7 +1,7 @@
 # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
 FROM phusion/baseimage:latest
-ARG FILEBEAT_VERSION=6.4.2
-ARG WAZUH_VERSION=3.6.1-1
+ARG FILEBEAT_VERSION=6.4.3
+ARG WAZUH_VERSION=3.7.0-1
 
 # Updating image
 RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold"