diff --git a/CHANGELOG.md b/CHANGELOG.md index 27506a2..e2253ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,16 @@ # Change Log 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) + ## Wazuh Docker v3.11.1_7.5.1 ### Added diff --git a/VERSION b/VERSION index a6dcc8c..f8fb3ef 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" diff --git a/docker-compose.yml b/docker-compose.yml index 0fb073a..354bfa1 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 66a0047..fac2719 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" @@ -15,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 @@ -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 diff --git a/kibana/Dockerfile b/kibana/Dockerfile index 79715c9..4df1c3a 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 9a8748c..69d59c2 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -3,17 +3,17 @@ 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 && \ 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