From b91e9ba3085c246e18a68caca4b935074ff99afb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Ruiz=20Ruiz?= <jose@wazuh.com>
Date: Fri, 29 Jun 2018 20:41:11 +0200
Subject: [PATCH] Upgrade Wazuh Manager to 3.3.1 and Elastic Stack 6.3.0

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

diff --git a/README.md b/README.md
index 746b5cba..2d85774d 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.3.1 and Elastic Stack version 6.2.4. 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.3.1 and Elastic Stack version 6.3.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 1c9dc053..a336c951 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -38,7 +38,7 @@ services:
     environment:
       - LS_HEAP_SIZE=2048m
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.2.4
+    image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.3.0
     hostname: elasticsearch
     restart: always
     ports:
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index bac729a0..3b964230 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-oss:6.2.4
-ARG WAZUH_APP_VERSION=3.3.0_6.2.4
+ARG WAZUH_APP_VERSION=3.3.1_6.3.0
 USER root
 
 ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
diff --git a/logstash/Dockerfile b/logstash/Dockerfile
index 02b6a1ab..8c30f0a6 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-oss:6.2.4
+FROM docker.elastic.co/logstash/logstash-oss:6.3.0
 
 RUN rm -f /usr/share/logstash/pipeline/logstash.conf
 
diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile
index 0725e156..881b2f35 100644
--- a/wazuh/Dockerfile
+++ b/wazuh/Dockerfile
@@ -1,6 +1,6 @@
 # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2)
 FROM phusion/baseimage:latest
-ARG FILEBEAT_VERSION=6.2.4
+ARG FILEBEAT_VERSION=6.3.0
 ARG WAZUH_VERSION=3.3.1-1
 
 # Updating image