From 9b2ecdb47dce743db2799c16f9cb6b1a7c61e092 Mon Sep 17 00:00:00 2001 From: "Manuel J. Bernal" Date: Wed, 12 Jun 2019 18:08:23 +0200 Subject: [PATCH 1/2] Bump version 3.8.2_6.8.0 --- README.md | 2 +- VERSION | 4 ++-- docker-compose.yml | 10 +++++----- elasticsearch/Dockerfile | 2 +- kibana/Dockerfile | 22 +++++++++++----------- wazuh/Dockerfile | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 030754ef..4c6350b1 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,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.2_6.8.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 3e8fc28f..5b38183e 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="3.9.1_6.8.0" -REVISION="3901" \ No newline at end of file +WAZUH-DOCKER_VERSION="3.9.2_6.8.0" +REVISION="3920" \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 8c43d7a7..c74348d1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: wazuh: - image: wazuh/wazuh:3.9.1_6.8.0 + image: wazuh/wazuh:3.9.2_6.8.0 hostname: wazuh-manager restart: always ports: @@ -14,7 +14,7 @@ services: depends_on: - logstash logstash: - image: wazuh/wazuh-logstash:3.9.1_6.8.0 + image: wazuh/wazuh-logstash:3.9.2_6.8.0 hostname: logstash restart: always links: @@ -26,7 +26,7 @@ services: environment: - LS_HEAP_SIZE=2048m elasticsearch: - image: wazuh/wazuh-elasticsearch:3.9.1_6.8.0 + image: wazuh/wazuh-elasticsearch:3.9.2_6.8.0 hostname: elasticsearch restart: always ports: @@ -43,7 +43,7 @@ services: hard: -1 mem_limit: 2g kibana: - image: wazuh/wazuh-kibana:3.9.1_6.8.0 + image: wazuh/wazuh-kibana:3.9.2_6.8.0 hostname: kibana restart: always depends_on: @@ -52,7 +52,7 @@ services: - elasticsearch:elasticsearch - wazuh:wazuh nginx: - image: wazuh/wazuh-nginx:3.9.1_6.8.0 + image: wazuh/wazuh-nginx:3.9.2_6.8.0 hostname: nginx restart: always environment: diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 10ecaea3..5832d8f3 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -13,7 +13,7 @@ ENV XPACK_ML="true" ENV ENABLE_CONFIGURE_S3="false" -ENV TEMPLATE_VERSION=v3.9.1 +ENV TEMPLATE_VERSION=v3.9.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 7d59926d..5aa04620 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,11 +1,11 @@ # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) FROM docker.elastic.co/kibana/kibana:6.8.0 -ARG WAZUH_APP_VERSION=3.9.1_6.8.0 +ARG WAZUH_APP_VERSION=3.9.2_6.8.0 USER root -ADD https://packages-dev.wazuh.com/pre-release/app/kibana/wazuhapp-3.9.1_6.8.0.zip /tmp +ADD https://packages-dev.wazuh.com/pre-release/app/kibana/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp -RUN NODE_OPTIONS="--max-old-space-size=3072" /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-3.9.1_6.8.0.zip &&\ +RUN NODE_OPTIONS="--max-old-space-size=3072" /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-${WAZUH_APP_VERSION}.zip &&\ chown -R kibana:kibana /usr/share/kibana &&\ rm -rf /tmp/* @@ -41,15 +41,15 @@ ENV PATTERN="" \ WAZUH_MONITORING_REPLICAS="" \ ADMIN_PRIVILEGES="" -ARG XPACK_CANVAS="true" -ARG XPACK_LOGS="true" -ARG XPACK_INFRA="true" -ARG XPACK_ML="true" -ARG XPACK_DEVTOOLS="true" -ARG XPACK_MONITORING="true" -ARG XPACK_APM="true" +ARG XPACK_CANVAS="false" +ARG XPACK_LOGS="false" +ARG XPACK_INFRA="false" +ARG XPACK_ML="false" +ARG XPACK_DEVTOOLS="false" +ARG XPACK_MONITORING="false" +ARG XPACK_APM="false" -ARG CHANGE_WELCOME="false" +ARG CHANGE_WELCOME="true" COPY --chown=kibana:kibana ./config/wazuh_app_config.sh ./ diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index e5016dd1..a58ddee1 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -1,7 +1,7 @@ # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) FROM phusion/baseimage:latest ARG FILEBEAT_VERSION=6.8.0 -ARG WAZUH_VERSION=3.9.1-1 +ARG WAZUH_VERSION=3.9.2-1 ENV API_USER="foo" \ API_PASS="bar" From 815039333de6118cdab016d19a819b6f44f3d671 Mon Sep 17 00:00:00 2001 From: "Manuel J. Bernal" Date: Wed, 12 Jun 2019 18:09:33 +0200 Subject: [PATCH 2/2] Updated CHANGELOG --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 003c533b..adf0f549 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.2_6.8.0 + +### Added + +- Update to Wazuh version 3.9.2_6.8.0 + ## Wazuh Docker v3.9.1_6.8.0 ### Added