From f14642ac1a75807214ecdb58d57f614463a25df5 Mon Sep 17 00:00:00 2001
From: Jose Luis Ruiz <jlruizmlg@gmail.com>
Date: Wed, 12 Sep 2018 01:04:47 -0400
Subject: [PATCH] Update to Wazuh 3.6.1 and Elastic Stack 6.4.0

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

diff --git a/README.md b/README.md
index 4daae703..fd07c61b 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,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.0 and Elastic Stack version 6.4.0. 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.6.1 and Elastic Stack version 6.4.0. 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 814cbc3b..3eaf8aac 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2'
 
 services:
   wazuh:
-    image: wazuh/wazuh:3.6.0_6.4.0
+    image: wazuh/wazuh:3.6.1_6.4.0
     hostname: wazuh-manager
     restart: always
     ports:
@@ -22,7 +22,7 @@ services:
     depends_on:
       - logstash
   logstash:
-    image: wazuh/wazuh-logstash:3.6.0_6.4.0
+    image: wazuh/wazuh-logstash:3.6.1_6.4.0
     hostname: logstash
     restart: always
 #    volumes:
@@ -60,7 +60,7 @@ services:
     networks:
         - docker_elk
   kibana:
-    image: wazuh/wazuh-kibana:3.6.0_6.4.0
+    image: wazuh/wazuh-kibana:3.6.1_6.4.0
     hostname: kibana
     restart: always
 #    ports:
@@ -75,7 +75,7 @@ services:
       - elasticsearch:elasticsearch
       - wazuh:wazuh
   nginx:
-    image: wazuh/wazuh-nginx:3.6.0_6.4.0
+    image: wazuh/wazuh-nginx:3.6.1_6.4.0
     hostname: nginx
     restart: always
     environment:
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index 8824df30..11af495e 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.0
-ARG WAZUH_APP_VERSION=3.6.0_6.4.0
+ARG WAZUH_APP_VERSION=3.6.1_6.4.0
 USER root
 
 ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile
index 46d095b0..ad33c985 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.0
-ARG WAZUH_VERSION=3.6.0-1
+ARG WAZUH_VERSION=3.6.1-1
 
 # Updating image
 RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold"
@@ -22,7 +22,7 @@ RUN echo "postfix postfix/mailname string wazuh-manager" | debconf-set-selection
 RUN echo "postfix postfix/main_mailer_type string 'Internet Site'" | debconf-set-selections
 
 # Install packages
-RUN apt-get update && apt-get -y install openssl postfix bsd-mailx   \
+RUN apt-get update && apt-get -y install openssl postfix bsd-mailx python-boto python-pip  \
     apt-transport-https vim expect nodejs python-cryptography wazuh-manager=${WAZUH_VERSION} \
     wazuh-api=${WAZUH_VERSION}