From 575708310b30921e925b518f2f42cb029a1fe5be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Ruiz=20Ruiz?= <jose@wazuh.com>
Date: Wed, 4 Apr 2018 15:23:59 -0400
Subject: [PATCH] Update docker to Wazug 3.2.1 Elastic 6.2.3

---
 docker-compose.yml       | 2 +-
 kibana/Dockerfile        | 8 ++++----
 kibana/config/kibana.yml | 2 +-
 logstash/Dockerfile      | 2 +-
 wazuh/Dockerfile         | 5 +++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 06294e28..f45d1e2c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -39,7 +39,7 @@ services:
       - LS_HEAP_SIZE=2048m
       - XPACK_MONITORING_ENABLED=false
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:6.2.2
+    image: docker.elastic.co/elasticsearch/elasticsearch:6.2.3
     hostname: elasticsearch
     restart: always
     ports:
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index 6a2f4b90..b7dec831 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,12 +1,12 @@
-FROM docker.elastic.co/kibana/kibana:6.2.2
-
+FROM docker.elastic.co/kibana/kibana:6.2.3
+ARG WAZUH_APP_VERSION=3.2.1_6.2.3
 USER root
 
 COPY ./config/kibana.yml /usr/share/kibana/config/kibana.yml
 
 COPY config/wait-for-it.sh /wait-for-it.sh
 
-ADD https://packages.wazuh.com/wazuhapp/wazuhapp-3.2.1_6.2.2.zip /tmp
+ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
 
 ADD https://raw.githubusercontent.com/wazuh/wazuh/3.2/extensions/elasticsearch/wazuh-elastic6-template-alerts.json /usr/share/kibana/config
 
@@ -14,7 +14,7 @@ ADD https://raw.githubusercontent.com/wazuh/wazuh/3.2/extensions/elasticsearch/w
 
 ADD https://raw.githubusercontent.com/wazuh/wazuh/3.2/extensions/elasticsearch/alert_sample.json /usr/share/kibana/config
 
-RUN /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-3.2.1_6.2.2.zip
+RUN /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-${WAZUH_APP_VERSION}.zip
 
 RUN chown -R kibana.kibana /usr/share/kibana
 
diff --git a/kibana/config/kibana.yml b/kibana/config/kibana.yml
index e898fe1a..68fc3188 100644
--- a/kibana/config/kibana.yml
+++ b/kibana/config/kibana.yml
@@ -96,4 +96,4 @@ xpack.grokdebugger.enabled: false
 xpack.graph.enabled: false
 xpack.ml.enabled: false
 xpack.monitoring.enabled: false
-xpack.reporting.enabled: false
\ No newline at end of file
+xpack.reporting.enabled: false
diff --git a/logstash/Dockerfile b/logstash/Dockerfile
index 1377040d..e32bdd5e 100644
--- a/logstash/Dockerfile
+++ b/logstash/Dockerfile
@@ -1,3 +1,3 @@
-FROM docker.elastic.co/logstash/logstash:6.2.2
+FROM docker.elastic.co/logstash/logstash:6.2.3
 
 COPY config/logstash.conf /etc/logstash/conf.d/logstash.conf
diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile
index d8e4eb93..1315c2e8 100644
--- a/wazuh/Dockerfile
+++ b/wazuh/Dockerfile
@@ -1,5 +1,6 @@
 FROM phusion/baseimage:latest
-ARG FILEBEAT_VERSION=6.2.2
+ARG FILEBEAT_VERSION=6.2.3
+ARG WAZUH_VERSION=3.2.1-1
 
 RUN apt-get update; apt-get -y dist-upgrade
 RUN apt-get -y install openssl postfix bsd-mailx curl apt-transport-https lsb-release
@@ -9,7 +10,7 @@ RUN curl --silent --location https://deb.nodesource.com/setup_6.x | bash - &&\
     apt-get install -y nodejs
 RUN curl -s https://packages.wazuh.com/key/GPG-KEY-WAZUH | apt-key add -
 RUN echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee -a /etc/apt/sources.list.d/wazuh.list
-RUN apt-get update && apt-get -y install wazuh-manager=3.2.1-1 wazuh-api=3.2.1-1 expect && apt-get clean
+RUN apt-get update && apt-get -y install wazuh-manager=${WAZUH_VERSION} wazuh-api=${WAZUH_VERSION} expect && apt-get clean
 
 ADD config/data_dirs.env /data_dirs.env
 ADD config/init.bash /init.bash