From fd18a0042982d886f1438a7a78429d7de52a690a Mon Sep 17 00:00:00 2001
From: Miguelangel Freitas <miguelangel@wazuh.com>
Date: Thu, 22 Mar 2018 17:43:11 +0000
Subject: [PATCH] Updating containers to latest versions.

---
 docker-compose.yml           |  2 +-
 kibana/Dockerfile            | 10 +++++++---
 kibana/config/wait-for-it.sh | 10 ++++++----
 logstash/Dockerfile          |  2 +-
 wazuh/Dockerfile             |  4 ++--
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index aabbc0dd..06294e28 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.1
+    image: docker.elastic.co/elasticsearch/elasticsearch:6.2.2
     hostname: elasticsearch
     restart: always
     ports:
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index d9391080..6a2f4b90 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.elastic.co/kibana/kibana:6.2.1
+FROM docker.elastic.co/kibana/kibana:6.2.2
 
 USER root
 
@@ -6,7 +6,7 @@ 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.0_6.2.1.zip /tmp
+ADD https://packages.wazuh.com/wazuhapp/wazuhapp-3.2.1_6.2.2.zip /tmp
 
 ADD https://raw.githubusercontent.com/wazuh/wazuh/3.2/extensions/elasticsearch/wazuh-elastic6-template-alerts.json /usr/share/kibana/config
 
@@ -14,8 +14,12 @@ 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.0_6.2.1.zip
+RUN /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-3.2.1_6.2.2.zip
+
+RUN chown -R kibana.kibana /usr/share/kibana
 
 RUN rm -rf /tmp/*
 
 RUN chmod 755 /wait-for-it.sh
+
+USER kibana
diff --git a/kibana/config/wait-for-it.sh b/kibana/config/wait-for-it.sh
index cee0d7be..560b7bf8 100644
--- a/kibana/config/wait-for-it.sh
+++ b/kibana/config/wait-for-it.sh
@@ -15,15 +15,15 @@ done
 
 sleep 5
 #Insert default templates
-cat /usr/share/kibana/config/wazuh-elastic6-template-alerts.json | curl -XPUT 'http://elasticsearch:9200/_template/wazuh' -H 'Content-Type: application/json' -d @-
+cat /usr/share/kibana/config/wazuh-elastic6-template-alerts.json | curl -XPUT "http://$host:9200/_template/wazuh" -H 'Content-Type: application/json' -d @-
 
 sleep 5
 #Insert default templates
-cat /usr/share/kibana/config/wazuh-elastic6-template-monitoring.json | curl -XPUT 'http://elasticsearch:9200/_template/wazuh-agent' -H 'Content-Type: application/json' -d @-
+cat /usr/share/kibana/config/wazuh-elastic6-template-monitoring.json | curl -XPUT "http://$host:9200/_template/wazuh-agent" -H 'Content-Type: application/json' -d @-
 
 #Insert sample alert:
 sleep 5
-cat /usr/share/kibana/config/alert_sample.json | curl -XPUT "http://elasticsearch:9200/wazuh-alerts-3.x-"`date +%Y.%m.%d`"/wazuh/sample" -H 'Content-Type: application/json' -d @-
+cat /usr/share/kibana/config/alert_sample.json | curl -XPUT "http://$host:9200/wazuh-alerts-3.x-"`date +%Y.%m.%d`"/wazuh/sample" -H 'Content-Type: application/json' -d @-
 
 sleep 5
 echo "Setting API credentials into Wazuh APP"
@@ -45,7 +45,9 @@ if [ "x$CONFIG_CODE" = "x404" ]; then
       "extensions": {
         "oscap": true,
         "audit": true,
-        "pci": true
+        "pci": true,
+        "aws": true,
+        "virustotal": true
       }
     }
     ' > /dev/null
diff --git a/logstash/Dockerfile b/logstash/Dockerfile
index b55c71f0..1377040d 100644
--- a/logstash/Dockerfile
+++ b/logstash/Dockerfile
@@ -1,3 +1,3 @@
-FROM docker.elastic.co/logstash/logstash:6.2.1
+FROM docker.elastic.co/logstash/logstash:6.2.2
 
 COPY config/logstash.conf /etc/logstash/conf.d/logstash.conf
diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile
index 9f3238a0..d8e4eb93 100644
--- a/wazuh/Dockerfile
+++ b/wazuh/Dockerfile
@@ -1,5 +1,5 @@
 FROM phusion/baseimage:latest
-ARG FILEBEAT_VERSION=6.2.1
+ARG FILEBEAT_VERSION=6.2.2
 
 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 +9,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.0-1 wazuh-api=3.2.0-1 expect
+RUN apt-get update && apt-get -y install wazuh-manager=3.2.1-1 wazuh-api=3.2.1-1 expect && apt-get clean
 
 ADD config/data_dirs.env /data_dirs.env
 ADD config/init.bash /init.bash