diff --git a/CHANGELOG.md b/CHANGELOG.md index 48c4e138..0a4035c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,23 @@ # Change Log All notable changes to this project will be documented in this file. +## Wazuh Docker v3.8.2_6.7.0 + +### Changed + +- Update Elastic Stack version to 6.7.0. ([#131](https://github.com/wazuh/wazuh-docker/pull/131)) + ## Wazuh Docker v3.8.2_6.6.2 ### Changed - Update Elastic Stack version to 6.6.2. ([#130](https://github.com/wazuh/wazuh-docker/pull/130)) -## Wazuh Docker v3.8.2_6.6.2 +## Wazuh Docker v3.8.2_6.6.1 ### Changed -- Update Elastic Stack version to 6.6.2. ([#129](https://github.com/wazuh/wazuh-docker/pull/129)) +- Update Elastic Stack version to 6.6.1. ([#129](https://github.com/wazuh/wazuh-docker/pull/129)) ## Wazuh Docker v3.8.2_6.5.4 diff --git a/README.md b/README.md index 28cdc27f..f3e82a5d 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,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.8.2_6.6.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.8.2_6.7.0) 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 4b4e1a3b..2c9de155 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="3.8.2_6.6.2" -REVISION="3802" +WAZUH-DOCKER_VERSION="3.8.2_6.7.0" +REVISION="3803" diff --git a/docker-compose.yml b/docker-compose.yml index a752310d..03af6a96 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: wazuh: - image: wazuh/wazuh:3.8.2_6.6.2 + image: wazuh/wazuh:3.8.2_6.7.0 hostname: wazuh-manager restart: always ports: @@ -14,7 +14,7 @@ services: depends_on: - logstash logstash: - image: wazuh/wazuh-logstash:3.8.2_6.6.2 + image: wazuh/wazuh-logstash:3.8.2_6.7.0 hostname: logstash restart: always links: @@ -26,7 +26,7 @@ services: environment: - LS_HEAP_SIZE=2048m elasticsearch: - image: wazuh/wazuh-elasticsearch:3.8.2_6.6.2 + image: wazuh/wazuh-elasticsearch:3.8.2_6.7.0 hostname: elasticsearch restart: always ports: @@ -43,7 +43,7 @@ services: hard: -1 mem_limit: 2g kibana: - image: wazuh/wazuh-kibana:3.8.2_6.6.2 + image: wazuh/wazuh-kibana:3.8.2_6.7.0 hostname: kibana restart: always depends_on: @@ -52,7 +52,7 @@ services: - elasticsearch:elasticsearch - wazuh:wazuh nginx: - image: wazuh/wazuh-nginx:3.8.2_6.6.2 + image: wazuh/wazuh-nginx:3.8.2_6.7.0 hostname: nginx restart: always environment: diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index c95c9e96..2a5ff67c 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.6.2 +FROM docker.elastic.co/elasticsearch/elasticsearch:6.7.0 ENV ALERTS_SHARDS="1" \ ALERTS_REPLICAS="0" @@ -23,7 +23,7 @@ COPY --chown=elasticsearch:elasticsearch ./config/load_settings.sh ./ RUN chmod +x ./load_settings.sh -RUN elasticsearch-plugin install --batch repository-s3 +RUN bin/elasticsearch-plugin install --batch https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-6.7.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 3ecfcec2..767c33d2 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,6 +1,6 @@ # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) -FROM docker.elastic.co/kibana/kibana:6.6.2 -ARG WAZUH_APP_VERSION=3.8.2_6.6.2 +FROM docker.elastic.co/kibana/kibana:6.7.0 +ARG WAZUH_APP_VERSION=3.8.2_6.7.0 USER root ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp diff --git a/logstash/Dockerfile b/logstash/Dockerfile index 75c71a6a..2ad4fb93 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.6.2 +FROM docker.elastic.co/logstash/logstash:6.7.0 COPY --chown=logstash:logstash config/entrypoint.sh /entrypoint.sh diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index 585a0227..e25f7936 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -1,6 +1,6 @@ # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) FROM phusion/baseimage:latest -ARG FILEBEAT_VERSION=6.6.2 +ARG FILEBEAT_VERSION=6.7.0 ARG WAZUH_VERSION=3.8.2-1 ENV API_USER="foo" \