From 2a77c6a6e6bf78f2492adeedbade7a507d9974b2 Mon Sep 17 00:00:00 2001 From: Jose M Date: Mon, 12 Aug 2019 17:20:56 +0200 Subject: [PATCH 01/14] Implement wazuh Filebeat Module --- wazuh/config/01-config_filebeat.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/wazuh/config/01-config_filebeat.sh b/wazuh/config/01-config_filebeat.sh index 61cd1c2a..8bb7146b 100644 --- a/wazuh/config/01-config_filebeat.sh +++ b/wazuh/config/01-config_filebeat.sh @@ -3,8 +3,17 @@ set -e +WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.1.tar.gz + # Modify the output to Elasticsearch if th ELASTICSEARCH_URL is set if [ "$ELASTICSEARCH_URL" != "" ]; then >&2 echo "Customize Elasticsearch ouput IP." sed -i 's|http://elasticsearch:9200|'$ELASTICSEARCH_URL'|g' /etc/filebeat/filebeat.yml -fi \ No newline at end of file +fi + +# Install Wazuh Filebeat Module + +curl -s "https://packages-dev.wazuh.com/3.x/filebeat/${WAZUH_FILEBEAT_MODULE}" | tar -xvz -C /usr/share/filebeat/module +mkdir -p /usr/share/filebeat/module/wazuh +chmod 755 -R /usr/share/filebeat/module/wazuh + From 62e39920cd3755fe66a878322361a579dcc3c95c Mon Sep 17 00:00:00 2001 From: Jose M Date: Mon, 12 Aug 2019 17:25:32 +0200 Subject: [PATCH 02/14] Update CHANGELOG.md --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee5aca1b..73d4b39c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ # Change Log All notable changes to this project will be documented in this file. +## Wazuh Docker v3.9.4_7.2.0 + +### Added + +- Update to Wazuh version 3.9.4_7.2.0 +- Implemented Wazuh Filebeat Module ([jm404](https://www.github.com/jm404)) [#2a77c6a](https://github.com/wazuh/wazuh-docker/commit/2a77c6a6e6bf78f2492adeedbade7a507d9974b2) + ## Wazuh Docker v3.9.3_7.2.0 ### Fixed From adc4efb69413659458a557678a5454e8bc9d1111 Mon Sep 17 00:00:00 2001 From: Jose M Date: Mon, 12 Aug 2019 17:26:01 +0200 Subject: [PATCH 03/14] Bump version --- VERSION | 4 ++-- elasticsearch/Dockerfile | 2 +- kibana/Dockerfile | 2 +- wazuh/Dockerfile | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/VERSION b/VERSION index 585e30a6..76d013af 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="3.9.3_7.2.0" -REVISION="3930" \ No newline at end of file +WAZUH-DOCKER_VERSION="3.9.4_7.2.0" +REVISION="3940" \ No newline at end of file diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 83023c08..556d4ff2 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -15,7 +15,7 @@ ENV XPACK_ML="true" ENV ENABLE_CONFIGURE_S3="false" -ARG TEMPLATE_VERSION=v3.9.3 +ARG TEMPLATE_VERSION=v3.9.4 # 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 d8830750..93d8c577 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,7 +1,7 @@ # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) FROM docker.elastic.co/kibana/kibana:7.2.0 ARG ELASTIC_VERSION=7.2.0 -ARG WAZUH_VERSION=3.9.3 +ARG WAZUH_VERSION=3.9.4 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}" USER root diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index da842789..d437daaa 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -3,12 +3,12 @@ FROM phusion/baseimage:latest ARG FILEBEAT_VERSION=7.2.0 -ARG WAZUH_VERSION=3.9.3-1 +ARG WAZUH_VERSION=3.9.4-1 ENV API_USER="foo" \ API_PASS="bar" -ARG TEMPLATE_VERSION="v3.9.3" +ARG TEMPLATE_VERSION="v3.9.4" # Set repositories. RUN set -x && echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /etc/apt/sources.list.d/wazuh.list && \ From a2dd5867a1175ef90e8d543cac938fbb0836c364 Mon Sep 17 00:00:00 2001 From: Jose M Date: Mon, 12 Aug 2019 17:27:11 +0200 Subject: [PATCH 04/14] Bump docker-compose to 3.9.4_7.2.0 --- docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b69f350b..b35a72e2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: wazuh: - image: wazuh/wazuh:3.9.3_7.2.0 + image: wazuh/wazuh:3.9.4_7.2.0 hostname: wazuh-manager restart: always ports: @@ -13,7 +13,7 @@ services: - "55000:55000" elasticsearch: - image: wazuh/wazuh-elasticsearch:3.9.3_7.2.0 + image: wazuh/wazuh-elasticsearch:3.9.4_7.2.0 hostname: elasticsearch restart: always ports: @@ -30,7 +30,7 @@ services: mem_limit: 2g kibana: - image: wazuh/wazuh-kibana:3.9.3_7.2.0 + image: wazuh/wazuh-kibana:3.9.4_7.2.0 hostname: kibana restart: always depends_on: @@ -39,7 +39,7 @@ services: - elasticsearch:elasticsearch - wazuh:wazuh nginx: - image: wazuh/wazuh-nginx:3.9.3_7.2.0 + image: wazuh/wazuh-nginx:3.9.4_7.2.0 hostname: nginx restart: always environment: From c2f43d0d2910d55ba33d91937b73f296fc186f41 Mon Sep 17 00:00:00 2001 From: Jose M Date: Mon, 12 Aug 2019 17:31:51 +0200 Subject: [PATCH 05/14] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73d4b39c..28beee25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Change Log All notable changes to this project will be documented in this file. +## Wazuh Docker v3.9.5_7.2.1 + +### Added + +- Update to Wazuh version 3.9.5_7.2.1 + ## Wazuh Docker v3.9.4_7.2.0 ### Added From 2c9c0f6ceace6956b859e8bdf65f9d5433814f87 Mon Sep 17 00:00:00 2001 From: Jose M Date: Mon, 12 Aug 2019 17:31:58 +0200 Subject: [PATCH 06/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7eae4b5a..7fdb7802 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ In addition, a docker-compose file is provided to launch the containers mentione * `stable` branch on correspond to the latest Wazuh-Docker stable version. * `master` branch contains the latest code, be aware of possible bugs on this branch. -* `Wazuh.Version_ElasticStack.Version` (for example 3.9.3_7.2.0) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch. +* `Wazuh.Version_ElasticStack.Version` (for example 3.9.5_7.2.1) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch. ## Credits and Thank you From f7eaf56691de90e81e176634281197c4181c5803 Mon Sep 17 00:00:00 2001 From: Jose M Date: Mon, 12 Aug 2019 17:32:26 +0200 Subject: [PATCH 07/14] Bump version --- VERSION | 4 ++-- docker-compose.yml | 8 ++++---- elasticsearch/Dockerfile | 4 ++-- kibana/Dockerfile | 6 +++--- wazuh/Dockerfile | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/VERSION b/VERSION index 76d013af..fdbe083e 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="3.9.4_7.2.0" -REVISION="3940" \ No newline at end of file +WAZUH-DOCKER_VERSION="3.9.5_7.2.1" +REVISION="3950" \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index b35a72e2..28c91e96 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: wazuh: - image: wazuh/wazuh:3.9.4_7.2.0 + image: wazuh/wazuh:3.9.5_7.2.1 hostname: wazuh-manager restart: always ports: @@ -13,7 +13,7 @@ services: - "55000:55000" elasticsearch: - image: wazuh/wazuh-elasticsearch:3.9.4_7.2.0 + image: wazuh/wazuh-elasticsearch:3.9.5_7.2.1 hostname: elasticsearch restart: always ports: @@ -30,7 +30,7 @@ services: mem_limit: 2g kibana: - image: wazuh/wazuh-kibana:3.9.4_7.2.0 + image: wazuh/wazuh-kibana:3.9.5_7.2.1 hostname: kibana restart: always depends_on: @@ -39,7 +39,7 @@ services: - elasticsearch:elasticsearch - wazuh:wazuh nginx: - image: wazuh/wazuh-nginx:3.9.4_7.2.0 + image: wazuh/wazuh-nginx:3.9.5_7.2.1 hostname: nginx restart: always environment: diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 556d4ff2..f0441e13 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -1,5 +1,5 @@ # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) -ARG ELASTIC_VERSION=7.2.0 +ARG ELASTIC_VERSION=7.2.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.9.4 +ARG TEMPLATE_VERSION=v3.9.5 # 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 93d8c577..b41a1737 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,7 +1,7 @@ # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) -FROM docker.elastic.co/kibana/kibana:7.2.0 -ARG ELASTIC_VERSION=7.2.0 -ARG WAZUH_VERSION=3.9.4 +FROM docker.elastic.co/kibana/kibana:7.2.1 +ARG ELASTIC_VERSION=7.2.1 +ARG WAZUH_VERSION=3.9.5 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}" USER root diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index d437daaa..5d88d095 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.2.0 +ARG FILEBEAT_VERSION=7.2.1 -ARG WAZUH_VERSION=3.9.4-1 +ARG WAZUH_VERSION=3.9.5-1 ENV API_USER="foo" \ API_PASS="bar" -ARG TEMPLATE_VERSION="v3.9.4" +ARG TEMPLATE_VERSION="v3.9.5" # Set repositories. RUN set -x && echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /etc/apt/sources.list.d/wazuh.list && \ From 6d393f976a2eb48a81d154cdc1579797ab4d5666 Mon Sep 17 00:00:00 2001 From: Jose M Date: Tue, 13 Aug 2019 12:16:55 +0200 Subject: [PATCH 08/14] Change Filebeat link to production. --- wazuh/config/01-config_filebeat.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wazuh/config/01-config_filebeat.sh b/wazuh/config/01-config_filebeat.sh index 8bb7146b..818878c0 100644 --- a/wazuh/config/01-config_filebeat.sh +++ b/wazuh/config/01-config_filebeat.sh @@ -13,7 +13,7 @@ fi # Install Wazuh Filebeat Module -curl -s "https://packages-dev.wazuh.com/3.x/filebeat/${WAZUH_FILEBEAT_MODULE}" | tar -xvz -C /usr/share/filebeat/module +curl -s "https://packages.wazuh.com/3.x/filebeat/${WAZUH_FILEBEAT_MODULE}" | tar -xvz -C /usr/share/filebeat/module mkdir -p /usr/share/filebeat/module/wazuh chmod 755 -R /usr/share/filebeat/module/wazuh From 57e71d5545fc3d334cd5e62d810d43ac967087e7 Mon Sep 17 00:00:00 2001 From: manuasir Date: Tue, 20 Aug 2019 13:47:19 +0200 Subject: [PATCH 09/14] Using ELK 7.3.0 --- elasticsearch/Dockerfile | 2 +- kibana/Dockerfile | 4 ++-- wazuh/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index f0441e13..ba353de1 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -1,5 +1,5 @@ # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) -ARG ELASTIC_VERSION=7.2.1 +ARG ELASTIC_VERSION=7.3.0 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" diff --git a/kibana/Dockerfile b/kibana/Dockerfile index b41a1737..08d96f57 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,6 +1,6 @@ # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) -FROM docker.elastic.co/kibana/kibana:7.2.1 -ARG ELASTIC_VERSION=7.2.1 +FROM docker.elastic.co/kibana/kibana:7.3.0 +ARG ELASTIC_VERSION=7.3.0 ARG WAZUH_VERSION=3.9.5 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}" diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index 5d88d095..4bbfeb71 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -1,7 +1,7 @@ # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) FROM phusion/baseimage:latest -ARG FILEBEAT_VERSION=7.2.1 +ARG FILEBEAT_VERSION=7.3.0 ARG WAZUH_VERSION=3.9.5-1 From aaed0058cea5c538995b16b21a1bdb4d3a6f3c24 Mon Sep 17 00:00:00 2001 From: Jose M Date: Tue, 24 Sep 2019 13:04:41 +0200 Subject: [PATCH 10/14] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28beee25..a4cbb750 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Change Log All notable changes to this project will be documented in this file. +## Wazuh Docker v3.10.0_7.3.2 + +### Added + +- Update to Wazuh version 3.10.0_7.3.2 + ## Wazuh Docker v3.9.5_7.2.1 ### Added From 8fc651216457c027811272caaab1397624813608 Mon Sep 17 00:00:00 2001 From: Jose M Date: Tue, 24 Sep 2019 13:05:43 +0200 Subject: [PATCH 11/14] Bump version to 3.10.0_7.3.2 --- README.md | 2 +- VERSION | 4 ++-- docker-compose.yml | 8 ++++---- elasticsearch/Dockerfile | 4 ++-- kibana/Dockerfile | 6 +++--- wazuh/Dockerfile | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 7fdb7802..444b4d09 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ In addition, a docker-compose file is provided to launch the containers mentione * `stable` branch on correspond to the latest Wazuh-Docker stable version. * `master` branch contains the latest code, be aware of possible bugs on this branch. -* `Wazuh.Version_ElasticStack.Version` (for example 3.9.5_7.2.1) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch. +* `Wazuh.Version_ElasticStack.Version` (for example 3.10.0_7.3.2) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch. ## Credits and Thank you diff --git a/VERSION b/VERSION index fdbe083e..fd21d789 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="3.9.5_7.2.1" -REVISION="3950" \ No newline at end of file +WAZUH-DOCKER_VERSION="3.10.0_7.3.2" +REVISION="3100" \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 28c91e96..607ccb34 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: wazuh: - image: wazuh/wazuh:3.9.5_7.2.1 + build: wazuh #wazuh/wazuh:3.10.0_7.3.2 hostname: wazuh-manager restart: always ports: @@ -13,7 +13,7 @@ services: - "55000:55000" elasticsearch: - image: wazuh/wazuh-elasticsearch:3.9.5_7.2.1 + build: elasticsearch #wazuh/wazuh-elasticsearch:3.10.0_7.3.2 hostname: elasticsearch restart: always ports: @@ -30,7 +30,7 @@ services: mem_limit: 2g kibana: - image: wazuh/wazuh-kibana:3.9.5_7.2.1 + build: kibana #wazuh/wazuh-kibana:3.10.0_7.3.2 hostname: kibana restart: always depends_on: @@ -39,7 +39,7 @@ services: - elasticsearch:elasticsearch - wazuh:wazuh nginx: - image: wazuh/wazuh-nginx:3.9.5_7.2.1 + build: nginx #wazuh/wazuh-nginx:3.10.0_7.3.2 hostname: nginx restart: always environment: diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index ba353de1..d498f039 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -1,5 +1,5 @@ # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) -ARG ELASTIC_VERSION=7.3.0 +ARG ELASTIC_VERSION=7.3.2 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.9.5 +ARG TEMPLATE_VERSION=v3.10.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 08d96f57..efd1bec0 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,7 +1,7 @@ # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) -FROM docker.elastic.co/kibana/kibana:7.3.0 -ARG ELASTIC_VERSION=7.3.0 -ARG WAZUH_VERSION=3.9.5 +FROM docker.elastic.co/kibana/kibana:7.3.2 +ARG ELASTIC_VERSION=7.3.2 +ARG WAZUH_VERSION=3.10.0 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}" USER root diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index 4bbfeb71..19a44476 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.3.0 +ARG FILEBEAT_VERSION=7.3.2 -ARG WAZUH_VERSION=3.9.5-1 +ARG WAZUH_VERSION=3.10.0-1 ENV API_USER="foo" \ API_PASS="bar" -ARG TEMPLATE_VERSION="v3.9.5" +ARG TEMPLATE_VERSION="v3.10.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 && \ From 6d44063077497e6816cad72c031397aa7148ec8d Mon Sep 17 00:00:00 2001 From: Jose M Date: Tue, 24 Sep 2019 13:12:57 +0200 Subject: [PATCH 12/14] Update docker-compose with 3.10.0_7.3.2 images --- docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 607ccb34..9cb4e4f7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: wazuh: - build: wazuh #wazuh/wazuh:3.10.0_7.3.2 + image: wazuh/wazuh:3.10.0_7.3.2 hostname: wazuh-manager restart: always ports: @@ -13,7 +13,7 @@ services: - "55000:55000" elasticsearch: - build: elasticsearch #wazuh/wazuh-elasticsearch:3.10.0_7.3.2 + image: wazuh/wazuh-elasticsearch:3.10.0_7.3.2 hostname: elasticsearch restart: always ports: @@ -30,7 +30,7 @@ services: mem_limit: 2g kibana: - build: kibana #wazuh/wazuh-kibana:3.10.0_7.3.2 + image: wazuh/wazuh-kibana:3.10.0_7.3.2 hostname: kibana restart: always depends_on: @@ -39,7 +39,7 @@ services: - elasticsearch:elasticsearch - wazuh:wazuh nginx: - build: nginx #wazuh/wazuh-nginx:3.10.0_7.3.2 + image: wazuh/wazuh-nginx:3.10.0_7.3.2 hostname: nginx restart: always environment: From 1f7e3a44988f5cce3a1b562a6918c63a17e60baf Mon Sep 17 00:00:00 2001 From: Jose M Date: Tue, 24 Sep 2019 14:22:57 +0200 Subject: [PATCH 13/14] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4cbb750..fca8573a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Change Log All notable changes to this project will be documented in this file. +## Wazuh Docker v3.10.2_7.3.2 + +### Added + +- Update to Wazuh version 3.10.2_7.3.2 + ## Wazuh Docker v3.10.0_7.3.2 ### Added From 6c9fce8964e13b257a958fc9bec9e5d5c2a58ab2 Mon Sep 17 00:00:00 2001 From: Jose M Date: Tue, 24 Sep 2019 14:24:05 +0200 Subject: [PATCH 14/14] Bump version to 3.10.2_7.3.2 --- README.md | 2 +- VERSION | 4 ++-- docker-compose.yml | 8 ++++---- elasticsearch/Dockerfile | 2 +- kibana/Dockerfile | 2 +- wazuh/Dockerfile | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 444b4d09..4635ac1b 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ In addition, a docker-compose file is provided to launch the containers mentione * `stable` branch on correspond to the latest Wazuh-Docker stable version. * `master` branch contains the latest code, be aware of possible bugs on this branch. -* `Wazuh.Version_ElasticStack.Version` (for example 3.10.0_7.3.2) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch. +* `Wazuh.Version_ElasticStack.Version` (for example 3.10.2_7.3.2) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch. ## Credits and Thank you diff --git a/VERSION b/VERSION index fd21d789..443c76ac 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="3.10.0_7.3.2" -REVISION="3100" \ No newline at end of file +WAZUH-DOCKER_VERSION="3.10.2_7.3.2" +REVISION="31020" \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 9cb4e4f7..327ab969 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: wazuh: - image: wazuh/wazuh:3.10.0_7.3.2 + image: wazuh/wazuh:3.10.2_7.3.2 hostname: wazuh-manager restart: always ports: @@ -13,7 +13,7 @@ services: - "55000:55000" elasticsearch: - image: wazuh/wazuh-elasticsearch:3.10.0_7.3.2 + image: wazuh/wazuh-elasticsearch:3.10.2_7.3.2 hostname: elasticsearch restart: always ports: @@ -30,7 +30,7 @@ services: mem_limit: 2g kibana: - image: wazuh/wazuh-kibana:3.10.0_7.3.2 + image: wazuh/wazuh-kibana:3.10.2_7.3.2 hostname: kibana restart: always depends_on: @@ -39,7 +39,7 @@ services: - elasticsearch:elasticsearch - wazuh:wazuh nginx: - image: wazuh/wazuh-nginx:3.10.0_7.3.2 + image: wazuh/wazuh-nginx:3.10.2_7.3.2 hostname: nginx restart: always environment: diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index d498f039..83d6d89f 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -15,7 +15,7 @@ ENV XPACK_ML="true" ENV ENABLE_CONFIGURE_S3="false" -ARG TEMPLATE_VERSION=v3.10.0 +ARG TEMPLATE_VERSION=v3.10.2 # 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 efd1bec0..12fb2c38 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,7 +1,7 @@ # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) FROM docker.elastic.co/kibana/kibana:7.3.2 ARG ELASTIC_VERSION=7.3.2 -ARG WAZUH_VERSION=3.10.0 +ARG WAZUH_VERSION=3.10.2 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}" USER root diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index 19a44476..a1fb62c6 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -3,12 +3,12 @@ FROM phusion/baseimage:latest ARG FILEBEAT_VERSION=7.3.2 -ARG WAZUH_VERSION=3.10.0-1 +ARG WAZUH_VERSION=3.10.2-1 ENV API_USER="foo" \ API_PASS="bar" -ARG TEMPLATE_VERSION="v3.10.0" +ARG TEMPLATE_VERSION="v3.10.2" # Set repositories. RUN set -x && echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /etc/apt/sources.list.d/wazuh.list && \