From 2e4f1ffe45771cb724a0ad47db7438d351040773 Mon Sep 17 00:00:00 2001
From: manuasir <manuel.jimenez@wazuh.com>
Date: Tue, 21 May 2019 19:13:15 +0200
Subject: [PATCH] Updating to 3.9.1-6.8.0

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

diff --git a/docker-compose.yml b/docker-compose.yml
index f45d2b1e..fa7df408 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2'
 
 services:
   wazuh:
-    image: wazuh/wazuh:3.9.0_6.7.2
+    build: wazuh
     hostname: wazuh-manager
     restart: always
     ports:
@@ -14,7 +14,7 @@ services:
     depends_on:
       - logstash
   logstash:
-    image: wazuh/wazuh-logstash:3.9.0_6.7.2
+    build: logstash
     hostname: logstash
     restart: always
     links:
@@ -26,7 +26,7 @@ services:
     environment:
       - LS_HEAP_SIZE=2048m
   elasticsearch:
-    image: wazuh/wazuh-elasticsearch:3.9.0_6.7.2
+    build: elasticsearch
     hostname: elasticsearch
     restart: always
     ports:
@@ -43,7 +43,7 @@ services:
         hard: -1
     mem_limit: 2g
   kibana:
-    image: wazuh/wazuh-kibana:3.9.0_6.7.2
+    build: kibana
     hostname: kibana
     restart: always
     depends_on:
@@ -52,7 +52,7 @@ services:
       - elasticsearch:elasticsearch
       - wazuh:wazuh
   nginx:
-    image: wazuh/wazuh-nginx:3.9.0_6.7.2
+    build: nginx
     hostname: nginx
     restart: always
     environment:
diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index 25e6e30b..4c5d62ac 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -1,5 +1,5 @@
 # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/elasticsearch/elasticsearch:6.7.2
+FROM docker.elastic.co/elasticsearch/elasticsearch:6.8.0
 
 ENV ELASTICSEARCH_URL="http://elasticsearch:9200"
 
@@ -39,7 +39,7 @@ COPY --chown=elasticsearch:elasticsearch ./config/load_settings.sh ./
 
 RUN chmod +x ./load_settings.sh
 
-RUN bin/elasticsearch-plugin install --batch https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-6.7.2.zip
+RUN bin/elasticsearch-plugin install --batch https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-6.8.0.zip
 
 COPY config/configure_s3.sh ./config/configure_s3.sh
 RUN chmod 755 ./config/configure_s3.sh
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index e6eda42f..ab00f3a8 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,11 +1,11 @@
 # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/kibana/kibana:6.7.2
-ARG WAZUH_APP_VERSION=3.9.0_6.7.2
+FROM docker.elastic.co/kibana/kibana:6.8.0
+ARG WAZUH_APP_VERSION=3.9.1_6.8.0
 USER root
 
-ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
+ADD https://packages-dev.wazuh.com/pre-release/app/kibana/wazuhapp-3.9.1_6.8.0.zip /tmp
 
-RUN NODE_OPTIONS="--max-old-space-size=3072" /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-${WAZUH_APP_VERSION}.zip &&\
+RUN NODE_OPTIONS="--max-old-space-size=3072" /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-3.9.1_6.8.0.zip &&\
     chown -R kibana:kibana /usr/share/kibana &&\
     rm -rf /tmp/*
 
diff --git a/logstash/Dockerfile b/logstash/Dockerfile
index 1aa79f50..404b7b9d 100644
--- a/logstash/Dockerfile
+++ b/logstash/Dockerfile
@@ -1,5 +1,5 @@
 # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/logstash/logstash:6.7.2
+FROM docker.elastic.co/logstash/logstash:6.8.0
 
 COPY --chown=logstash:logstash config/entrypoint.sh /entrypoint.sh
 
diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile
index 454f8ea9..e5016dd1 100644
--- a/wazuh/Dockerfile
+++ b/wazuh/Dockerfile
@@ -1,7 +1,7 @@
 # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 FROM phusion/baseimage:latest
-ARG FILEBEAT_VERSION=6.7.2
-ARG WAZUH_VERSION=3.9.0-1
+ARG FILEBEAT_VERSION=6.8.0
+ARG WAZUH_VERSION=3.9.1-1
 
 ENV API_USER="foo" \
     API_PASS="bar"
@@ -16,8 +16,8 @@ RUN set -x && echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /
 
 RUN add-apt-repository universe && apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" && \
    apt-get --no-install-recommends --no-install-suggests -y install openssl postfix bsd-mailx python-boto python-pip  \
-   apt-transport-https vim expect nodejs python-cryptography mailutils libsasl2-modules wazuh-manager=${WAZUH_VERSION} \
-   wazuh-api=${WAZUH_VERSION} && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -f \
+   apt-transport-https vim expect nodejs python-cryptography mailutils libsasl2-modules wazuh-manager \
+   wazuh-api && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -f \
    /var/ossec/logs/alerts/*/*/*.log && rm -f /var/ossec/logs/alerts/*/*/*.json && rm -f \
    /var/ossec/logs/archives/*/*/*.log && rm -f /var/ossec/logs/archives/*/*/*.json && rm -f \
    /var/ossec/logs/firewall/*/*/*.log && rm -f /var/ossec/logs/firewall/*/*/*.json