From 881a0abfa57973edeaa2de333ac87cec0a0996a2 Mon Sep 17 00:00:00 2001 From: "Manuel J. Bernal" Date: Sat, 20 Jul 2019 18:32:33 +0200 Subject: [PATCH] Bump version --- CHANGELOG.md | 5 +++++ README.md | 2 +- VERSION | 4 ++-- docker-compose.yml | 20 +++++--------------- elasticsearch/Dockerfile | 4 ++-- kibana/Dockerfile | 6 +++--- wazuh/Dockerfile | 6 +++--- 7 files changed, 21 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd19f395..ee5aca1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log All notable changes to this project will be documented in this file. +## Wazuh Docker v3.9.3_7.2.0 + +### Fixed +- Wazuh-docker reinserts cluster settings after resuming containers ([@manuasir](https://github.com/manuasir)) [#213](https://github.com/wazuh/wazuh-docker/pull/213) + ## Wazuh Docker v3.9.2_7.1.1 ### Added diff --git a/README.md b/README.md index 173b7eb5..7eae4b5a 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.1_6.8.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.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. ## Credits and Thank you diff --git a/VERSION b/VERSION index 84433ac9..585e30a6 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="3.9.2_7.1.1" -REVISION="3920" \ No newline at end of file +WAZUH-DOCKER_VERSION="3.9.3_7.2.0" +REVISION="3930" \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 6face8e8..fb28f66e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: wazuh: - image: wazuh/wazuh:3.9.2_7.1.1 + image: wazuh/wazuh:3.9.3_7.2.0 hostname: wazuh-manager restart: always ports: @@ -11,8 +11,9 @@ services: - "1515:1515" - "514:514/udp" - "55000:55000" + elasticsearch: - build: elasticsearch + image: wazuh/wazuh-kibana:3.9.3_7.2.0 hostname: elasticsearch restart: always ports: @@ -22,25 +23,14 @@ services: - ELASTIC_CLUSTER=true - CLUSTER_NODE_MASTER=true - CLUSTER_MASTER_NODE_NAME=es01 - - es02: - build: elasticsearch - hostname: es02 - restart: always - environment: - - "ES_JAVA_OPTS=-Xms1g -Xmx1g" - - ELASTIC_CLUSTER=true - - CLUSTER_MASTER_NODE_NAME=elasticsearch - - CLUSTER_NODE_NAME=es02 ulimits: memlock: soft: -1 hard: -1 mem_limit: 2g - kibana: - image: wazuh/wazuh-kibana:3.9.2_7.1.1 + image: wazuh/wazuh-kibana:3.9.3_7.2.0 hostname: kibana restart: always depends_on: @@ -49,7 +39,7 @@ services: - elasticsearch:elasticsearch - wazuh:wazuh nginx: - image: wazuh/wazuh-nginx:3.9.2_7.1.1 + image: wazuh/wazuh-nginx:3.9.3_7.2.0 hostname: nginx restart: always environment: diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index a2764d01..83023c08 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -1,5 +1,5 @@ # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) -ARG ELASTIC_VERSION=7.1.1 +ARG ELASTIC_VERSION=7.2.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" @@ -15,7 +15,7 @@ ENV XPACK_ML="true" ENV ENABLE_CONFIGURE_S3="false" -ARG TEMPLATE_VERSION=v3.9.2 +ARG TEMPLATE_VERSION=v3.9.3 # 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 e521eb43..dafeb622 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.1.1 -ARG ELASTIC_VERSION=7.1.1 -ARG WAZUH_VERSION=3.9.2 +FROM docker.elastic.co/kibana/kibana:7.2.0 +ARG ELASTIC_VERSION=7.2.0 +ARG WAZUH_VERSION=3.9.3 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}" USER root diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index e4a2814c..da842789 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.1.1 +ARG FILEBEAT_VERSION=7.2.0 -ARG WAZUH_VERSION=3.9.2-1 +ARG WAZUH_VERSION=3.9.3-1 ENV API_USER="foo" \ API_PASS="bar" -ARG TEMPLATE_VERSION="v3.9.2" +ARG TEMPLATE_VERSION="v3.9.3" # Set repositories. RUN set -x && echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /etc/apt/sources.list.d/wazuh.list && \