From 43da69277ff16f73497618fa5aae86fa39582b8b Mon Sep 17 00:00:00 2001 From: Anthony Sendra Date: Fri, 10 Jan 2020 12:49:09 +0100 Subject: [PATCH 1/6] fix s3 plugin --- elasticsearch/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 66a00475..3c507ca0 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -1,6 +1,7 @@ # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) ARG ELASTIC_VERSION=7.5.1 FROM docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION} +ARG ELASTIC_VERSION ARG S3_PLUGIN_URL="https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-${ELASTIC_VERSION}.zip" ENV ELASTICSEARCH_URL="http://elasticsearch:9200" @@ -42,7 +43,7 @@ COPY --chown=elasticsearch:elasticsearch ./config/load_settings.sh ./ RUN chmod +x ./load_settings.sh -RUN ${bin/elasticsearch-plugin install --batch S3_PLUGIN_URL} +RUN bin/elasticsearch-plugin install --batch $S3_PLUGIN_URL COPY config/configure_s3.sh ./config/configure_s3.sh RUN chmod 755 ./config/configure_s3.sh From 9f710f90c3d122b2a2210b8734d77feec371a605 Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez Date: Wed, 22 Jan 2020 14:38:28 +0100 Subject: [PATCH 2/6] Bump to version 3.11.2_7.5.1 --- docker-compose.yml | 8 ++++---- elasticsearch/Dockerfile | 2 +- kibana/Dockerfile | 2 +- wazuh/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0fb073a0..354bfa1f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: wazuh: - image: wazuh/wazuh:3.11.1_7.5.1 + image: wazuh/wazuh:3.11.2_7.5.1 hostname: wazuh-manager restart: always ports: @@ -13,7 +13,7 @@ services: - "55000:55000" elasticsearch: - image: wazuh/wazuh-elasticsearch:3.11.1_7.5.1 + image: wazuh/wazuh-elasticsearch:3.11.2_7.5.1 hostname: elasticsearch restart: always ports: @@ -30,7 +30,7 @@ services: mem_limit: 2g kibana: - image: wazuh/wazuh-kibana:3.11.1_7.5.1 + image: wazuh/wazuh-kibana:3.11.2_7.5.1 hostname: kibana restart: always depends_on: @@ -39,7 +39,7 @@ services: - elasticsearch:elasticsearch - wazuh:wazuh nginx: - image: wazuh/wazuh-nginx:3.11.1_7.5.1 + image: wazuh/wazuh-nginx:3.11.2_7.5.1 hostname: nginx restart: always environment: diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 3c507ca0..fac27192 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -16,7 +16,7 @@ ENV XPACK_ML="true" ENV ENABLE_CONFIGURE_S3="false" -ARG TEMPLATE_VERSION=v3.11.1 +ARG TEMPLATE_VERSION=v3.11.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 79715c91..4df1c3a2 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -2,7 +2,7 @@ FROM docker.elastic.co/kibana/kibana:7.5.1 USER kibana ARG ELASTIC_VERSION=7.5.1 -ARG WAZUH_VERSION=3.11.1 +ARG WAZUH_VERSION=3.11.2 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}" #ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /usr/share/kibana/ diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index 9a8748cf..598cb9f3 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -3,12 +3,12 @@ FROM phusion/baseimage:latest ARG FILEBEAT_VERSION=7.5.1 -ARG WAZUH_VERSION=3.11.1-1 +ARG WAZUH_VERSION=3.11.2-1 ENV API_USER="foo" \ API_PASS="bar" -ARG TEMPLATE_VERSION="v3.11.1" +ARG TEMPLATE_VERSION="v3.11.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 && \ From a561deeaec7a9ebcdec8d6713e90192d3f8f7626 Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez Date: Wed, 22 Jan 2020 14:38:53 +0100 Subject: [PATCH 3/6] Update VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index a6dcc8c8..f8fb3ef5 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="3.11.1_7.5.1" -REVISION="31110" +WAZUH-DOCKER_VERSION="3.11.2_7.5.1" +REVISION="31120" From a4a64e66f40ed1c1ff41dfb229265a6f3743f23e Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez Date: Wed, 22 Jan 2020 14:39:07 +0100 Subject: [PATCH 4/6] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27506a28..e44ec585 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.11.2_7.5.1 + +### Fixed + +- Fix S3 Plugin ([@AnthonySendra](https://github.com/AnthonySendra)) [#293](https://github.com/wazuh/wazuh-docker/pull/293) + ## Wazuh Docker v3.11.1_7.5.1 ### Added From 8615cd4d2152601e55becc7c3675360938e74b6a Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez Date: Wed, 22 Jan 2020 15:48:27 +0100 Subject: [PATCH 5/6] Bump nodejs to v10 --- wazuh/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index 598cb9f3..69d59c25 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -13,7 +13,7 @@ ARG TEMPLATE_VERSION="v3.11.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 && \ curl -s https://packages.wazuh.com/key/GPG-KEY-WAZUH | apt-key add - && \ - curl --silent --location https://deb.nodesource.com/setup_8.x | bash - && \ + curl --silent --location https://deb.nodesource.com/setup_10.x | bash - && \ echo "postfix postfix/mailname string wazuh-manager" | debconf-set-selections && \ echo "postfix postfix/main_mailer_type string 'Internet Site'" | debconf-set-selections && \ groupadd -g 1000 ossec && useradd -u 1000 -g 1000 -d /var/ossec ossec From 427b87d6e1a67e86564be80193f2f3b8ddf88c07 Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez Date: Wed, 22 Jan 2020 15:54:13 +0100 Subject: [PATCH 6/6] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e44ec585..e2253ec5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. ## Wazuh Docker v3.11.2_7.5.1 +### Added + +- Bumped Node.js to version 10 ([@xr09](https://github.com/xr09)) [#8615cd4](https://github.com/wazuh/wazuh-docker/commit/8615cd4d2152601e55becc7c3675360938e74b6a) + ### Fixed - Fix S3 Plugin ([@AnthonySendra](https://github.com/AnthonySendra)) [#293](https://github.com/wazuh/wazuh-docker/pull/293)