From 66f50039b0830f922e4b42d80c3fba8a014d7c23 Mon Sep 17 00:00:00 2001
From: Manuel Gutierrez <manuel.gutierrez@wazuh.com>
Date: Tue, 24 Dec 2019 16:19:52 +0100
Subject: [PATCH] Bump version to 3.11.0_7.5.1

---
 VERSION                  | 4 ++--
 docker-compose.yml       | 8 ++++----
 elasticsearch/Dockerfile | 4 ++--
 kibana/Dockerfile        | 6 +++---
 wazuh/Dockerfile         | 8 ++++----
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/VERSION b/VERSION
index e7de9ceb..407ab706 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-WAZUH-DOCKER_VERSION="3.10.2_7.5.0"
-REVISION="31030"
\ No newline at end of file
+WAZUH-DOCKER_VERSION="3.11.0_7.5.1"
+REVISION="31100"
diff --git a/docker-compose.yml b/docker-compose.yml
index c80df55e..5f6b23c8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2'
 
 services:
   wazuh:
-    image: wazuh/wazuh:3.10.2_7.5.0
+    image: wazuh/wazuh:3.11.0_7.5.1
     hostname: wazuh-manager
     restart: always
     ports:
@@ -13,7 +13,7 @@ services:
       - "55000:55000"
 
   elasticsearch:
-    image: wazuh/wazuh-elasticsearch:3.10.2_7.5.0
+    image: wazuh/wazuh-elasticsearch:3.11.0_7.5.1
     hostname: elasticsearch
     restart: always
     ports:
@@ -30,7 +30,7 @@ services:
     mem_limit: 2g
 
   kibana:
-    image: wazuh/wazuh-kibana:3.10.2_7.5.0
+    image: wazuh/wazuh-kibana:3.11.0_7.5.1
     hostname: kibana
     restart: always
     depends_on:
@@ -39,7 +39,7 @@ services:
       - elasticsearch:elasticsearch
       - wazuh:wazuh
   nginx:
-    image: wazuh/wazuh-nginx:3.10.2_7.5.0
+    image: wazuh/wazuh-nginx:3.11.0_7.5.1
     hostname: nginx
     restart: always
     environment:
diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index 25633294..ede61fbc 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -1,5 +1,5 @@
 # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
-ARG ELASTIC_VERSION=7.5.0
+ARG ELASTIC_VERSION=7.5.1
 FROM docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION}
 ARG S3_PLUGIN_URL="https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-${ELASTIC_VERSION}.zip"
 
@@ -15,7 +15,7 @@ ENV XPACK_ML="true"
 
 ENV ENABLE_CONFIGURE_S3="false"
 
-ARG TEMPLATE_VERSION=v3.10.2
+ARG TEMPLATE_VERSION=v3.11.0
 
 # Elasticearch cluster configuration environment variables
 # If ELASTIC_CLUSTER is set to "true" the following variables will be added to the Elasticsearch configuration
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
index d7f64b61..3bfad3de 100644
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,8 +1,8 @@
 # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/kibana/kibana:7.5.0
+FROM docker.elastic.co/kibana/kibana:7.5.1
 USER kibana
-ARG ELASTIC_VERSION=7.5.0
-ARG WAZUH_VERSION=3.10.2
+ARG ELASTIC_VERSION=7.5.1
+ARG WAZUH_VERSION=3.11.0
 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
 
 #ADD  https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /usr/share/kibana/
diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile
index cc813988..4dc7b238 100644
--- a/wazuh/Dockerfile
+++ b/wazuh/Dockerfile
@@ -1,14 +1,14 @@
 # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 FROM phusion/baseimage:latest
 
-ARG FILEBEAT_VERSION=7.5.0
+ARG FILEBEAT_VERSION=7.5.1
 
-ARG WAZUH_VERSION=3.10.2-1
+ARG WAZUH_VERSION=3.11.0-1
 
 ENV API_USER="foo" \
    API_PASS="bar"
 
-ARG TEMPLATE_VERSION="v3.10.2"
+ARG TEMPLATE_VERSION="v3.11.0"
 
 # Set repositories.
 RUN set -x && echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /etc/apt/sources.list.d/wazuh.list && \
@@ -77,4 +77,4 @@ ADD https://raw.githubusercontent.com/wazuh/wazuh/$TEMPLATE_VERSION/extensions/e
 RUN chmod go-w /etc/filebeat/wazuh-template.json 
 
 # Run all services
-ENTRYPOINT ["/entrypoint.sh"]
\ No newline at end of file
+ENTRYPOINT ["/entrypoint.sh"]