From 59f60f63b614628f06816122c7e2ebd955e52395 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Fri, 12 Jul 2019 16:35:26 +0200 Subject: [PATCH] Upgrade to 3.9.3_6.8.1 version (#207) --- CHANGELOG.md | 8 +++++++- README.md | 2 +- docker-compose.yml | 8 ++++---- elasticsearch/Dockerfile | 6 +++--- elasticsearch/config/30-entrypoint.sh | 2 +- kibana/Dockerfile | 4 ++-- logstash/Dockerfile | 2 +- wazuh/Dockerfile | 4 ++-- 8 files changed, 21 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24374c7b..a4b1fb68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,13 @@ # Change Log All notable changes to this project will be documented in this file. -## Wazuh Docker v3.9.0_7.0.0 +## Wazuh Docker v3.9.3_7.0.0 + +## Wazuh Docker v3.9.3_6.8.1 + +### Added + +- Update to Wazuh version 3.9.3_6.8.1 ### Added diff --git a/README.md b/README.md index 4c6350b1..8a673685 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.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. +* `Wazuh.Version_ElasticStack.Version` (for example 3.9.3_6.8.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 diff --git a/docker-compose.yml b/docker-compose.yml index 4a27bb84..fb4171a9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: wazuh: - image: wazuh/wazuh:3.9.2_6.8.0 + image: wazuh/wazuh:3.9.3_6.8.1 hostname: wazuh-manager restart: always ports: @@ -14,7 +14,7 @@ services: depends_on: - logstash logstash: - image: wazuh/wazuh-logstash:3.9.2_6.8.0 + image: wazuh/wazuh-logstash:3.9.3_6.8.1 hostname: logstash restart: always links: @@ -32,7 +32,7 @@ services: - ELASTICSEARCH_URL=https://elasticsearch:9200 - SECURITY_CA_PEM=server.TEST-CA-signed.pem elasticsearch: - image: wazuh/wazuh-elasticsearch:3.9.2_6.8.0 + image: wazuh/wazuh-elasticsearch:3.9.3_6.8.1 hostname: elasticsearch restart: always ports: @@ -69,7 +69,7 @@ services: hard: -1 mem_limit: 2g kibana: - image: wazuh/wazuh-kibana:3.9.2_6.8.0 + image: wazuh/wazuh-kibana:3.9.3_6.8.1 hostname: kibana restart: always depends_on: diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 9e697131..70f1faed 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.8.0 +FROM docker.elastic.co/elasticsearch/elasticsearch:6.8.1 ENV ALERTS_SHARDS="1" \ ALERTS_REPLICAS="0" @@ -11,7 +11,7 @@ ENV XPACK_ML="true" ENV ENABLE_CONFIGURE_S3="false" -ENV TEMPLATE_VERSION=v3.9.2 +ENV TEMPLATE_VERSION=v3.9.3 # This CA is created for testing. Please set your own CA zip containing the key and the signed certificate. @@ -61,7 +61,7 @@ COPY --chown=elasticsearch:elasticsearch ./config/load_settings.sh ./ RUN chmod +x ./load_settings.sh -RUN bin/elasticsearch-plugin install --batch https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-6.8.0.zip +RUN bin/elasticsearch-plugin install --batch https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-6.8.1.zip COPY config/configure_s3.sh ./config/configure_s3.sh RUN chmod 755 ./config/configure_s3.sh diff --git a/elasticsearch/config/30-entrypoint.sh b/elasticsearch/config/30-entrypoint.sh index 74317a5a..c1e45d1b 100644 --- a/elasticsearch/config/30-entrypoint.sh +++ b/elasticsearch/config/30-entrypoint.sh @@ -1,7 +1,7 @@ #!/bin/bash # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) -# For more information https://github.com/elastic/elasticsearch-docker/blob/6.8.0/build/elasticsearch/bin/docker-entrypoint.sh +# For more information https://github.com/elastic/elasticsearch-docker/blob/6.8.1/build/elasticsearch/bin/docker-entrypoint.sh set -e diff --git a/kibana/Dockerfile b/kibana/Dockerfile index 005371da..5fe761a7 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.8.0 -ARG WAZUH_APP_VERSION=3.9.2_6.8.0 +FROM docker.elastic.co/kibana/kibana:6.8.1 +ARG WAZUH_APP_VERSION=3.9.3_6.8.1 USER root ADD https://packages-dev.wazuh.com/pre-release/app/kibana/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp diff --git a/logstash/Dockerfile b/logstash/Dockerfile index 70ab4799..820d301b 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.8.0 +FROM docker.elastic.co/logstash/logstash:6.8.1 COPY --chown=logstash:logstash config/entrypoint.sh /entrypoint.sh diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index fca86f9c..6e252930 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -2,8 +2,8 @@ FROM phusion/baseimage:latest # Arguments -ARG FILEBEAT_VERSION=6.8.0 -ARG WAZUH_VERSION=3.9.2-1 +ARG FILEBEAT_VERSION=6.8.1 +ARG WAZUH_VERSION=3.9.3-1 # Environment variables ENV API_USER="foo" \