Merge pull request #722 from wazuh/bump-3-13-6

Bump 3.13 to 3.13.6

CHANGELOG.md

@@ -1,12 +1,50 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## Wazuh Docker v3.13.6_7.9.2
+
+### Added
+
+- Update to Wazuh version 3.13.6_7.9.2
+
+## Wazuh Docker v3.13.5_7.9.2
+
+### Added
+
+- Update to Wazuh version 3.13.5_7.9.2
+
+## Wazuh Docker v3.13.4_7.9.2
+
+### Added
+
+- Update to Wazuh version 3.13.4_7.9.2
+
+## Wazuh Docker v3.13.3_7.9.2
+
+### Added
+
+- Update to Wazuh version 3.13.3_7.9.2
+
+## Wazuh Docker v3.13.2_7.9.1
+
+### Added
+
+- Update to Wazuh version 3.13.2_7.9.1
+- Add CLUSTER_NETWORK_HOST environment variable ([@jfut](https://github.com/jfut)) [#372](https://github.com/wazuh/wazuh-docker/pull/372)
+
+### Fixed
+
+- Too many redirects when running on port 80 ([@chowmean](https://github.com/chowmean)) [#377](https://github.com/wazuh/wazuh-docker/pull/377)
+- Move Filebeat installation to build stage ([@xr09](https://github.com/xr09)) [#378](https://github.com/wazuh/wazuh-docker/pull/378)
+
+
 ## Wazuh Docker v3.13.1_7.8.0
 
 ### Added
 
 - Update to Wazuh version 3.13.1_7.8.0
 
+
 ## Wazuh Docker v3.13.0_7.7.1
 
 ### Added

VERSION

@@ -1,2 +1,2 @@
-WAZUH-DOCKER_VERSION="3.13.1_7.8.0"
-REVISION="31310"
+WAZUH-DOCKER_VERSION="3.13.6_7.9.2"
+REVISION="31314"

docker-compose.yml

@@ -3,7 +3,7 @@ version: '2'
 
 services:
   wazuh:
-    image: wazuh/wazuh:3.13.1_7.8.0
+    image: wazuh/wazuh:3.13.6_7.9.2
     hostname: wazuh-manager
     restart: always
     ports:
@@ -13,7 +13,7 @@ services:
       - "55000:55000"
 
   elasticsearch:
-    image: wazuh/wazuh-elasticsearch:3.13.1_7.8.0
+    image: wazuh/wazuh-elasticsearch:3.13.6_7.9.2
     hostname: elasticsearch
     restart: always
     ports:
@@ -30,7 +30,7 @@ services:
     mem_limit: 2g
 
   kibana:
-    image: wazuh/wazuh-kibana:3.13.1_7.8.0
+    image: wazuh/wazuh-kibana:3.13.6_7.9.2
     hostname: kibana
     restart: always
     depends_on:
@@ -40,7 +40,7 @@ services:
       - wazuh:wazuh
 
   nginx:
-    image: wazuh/wazuh-nginx:3.13.1_7.8.0
+    image: wazuh/wazuh-nginx:3.13.6_7.9.2
     hostname: nginx
     restart: always
     environment:

elasticsearch/Dockerfile

@@ -1,5 +1,5 @@
 # Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
-ARG ELASTIC_VERSION=7.8.0
+ARG ELASTIC_VERSION=7.9.2
 FROM docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION}
 ARG ELASTIC_VERSION
 ARG S3_PLUGIN_URL="https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-${ELASTIC_VERSION}.zip"
@@ -16,7 +16,7 @@ ENV XPACK_ML="true"
 
 ENV ENABLE_CONFIGURE_S3="false"
 
-ARG TEMPLATE_VERSION=v3.13.1
+ARG TEMPLATE_VERSION=v3.13.6
 
 # Elasticearch cluster configuration environment variables
 # If ELASTIC_CLUSTER is set to "true" the following variables will be added to the Elasticsearch configuration

kibana/Dockerfile

@@ -1,8 +1,8 @@
 # Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
-FROM docker.elastic.co/kibana/kibana:7.8.0
+FROM docker.elastic.co/kibana/kibana:7.9.2
 USER kibana
-ARG ELASTIC_VERSION=7.8.0
-ARG WAZUH_VERSION=3.13.1
+ARG ELASTIC_VERSION=7.9.2
+ARG WAZUH_VERSION=3.13.6
 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
 
 WORKDIR /usr/share/kibana

wazuh/Dockerfile

@@ -1,14 +1,14 @@
 # Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2)
 FROM phusion/baseimage:0.10.2
 
-ARG FILEBEAT_VERSION=7.8.0
+ARG FILEBEAT_VERSION=7.9.2
 
-ARG WAZUH_VERSION=3.13.1-1
+ARG WAZUH_VERSION=3.13.6-1
 
 ENV API_USER="foo" \
    API_PASS="bar"
 
-ARG TEMPLATE_VERSION="v3.13.1"
+ARG TEMPLATE_VERSION="v3.13.6"
 
 # Set repositories.
 RUN set -x && echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /etc/apt/sources.list.d/wazuh.list && \