forked from wazuh/wazuh-docker
Bump version
This commit is contained in:
@@ -1,6 +1,11 @@
|
|||||||
# Change Log
|
# Change Log
|
||||||
All notable changes to this project will be documented in this file.
|
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
|
## Wazuh Docker v3.9.2_7.1.1
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|||||||
@@ -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.
|
* `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.
|
* `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
|
## Credits and Thank you
|
||||||
|
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
WAZUH-DOCKER_VERSION="3.9.2_7.1.1"
|
WAZUH-DOCKER_VERSION="3.9.3_7.2.0"
|
||||||
REVISION="3920"
|
REVISION="3930"
|
||||||
+5
-15
@@ -3,7 +3,7 @@ version: '2'
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
wazuh:
|
wazuh:
|
||||||
image: wazuh/wazuh:3.9.2_7.1.1
|
image: wazuh/wazuh:3.9.3_7.2.0
|
||||||
hostname: wazuh-manager
|
hostname: wazuh-manager
|
||||||
restart: always
|
restart: always
|
||||||
ports:
|
ports:
|
||||||
@@ -11,8 +11,9 @@ services:
|
|||||||
- "1515:1515"
|
- "1515:1515"
|
||||||
- "514:514/udp"
|
- "514:514/udp"
|
||||||
- "55000:55000"
|
- "55000:55000"
|
||||||
|
|
||||||
elasticsearch:
|
elasticsearch:
|
||||||
build: elasticsearch
|
image: wazuh/wazuh-kibana:3.9.3_7.2.0
|
||||||
hostname: elasticsearch
|
hostname: elasticsearch
|
||||||
restart: always
|
restart: always
|
||||||
ports:
|
ports:
|
||||||
@@ -22,25 +23,14 @@ services:
|
|||||||
- ELASTIC_CLUSTER=true
|
- ELASTIC_CLUSTER=true
|
||||||
- CLUSTER_NODE_MASTER=true
|
- CLUSTER_NODE_MASTER=true
|
||||||
- CLUSTER_MASTER_NODE_NAME=es01
|
- 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:
|
ulimits:
|
||||||
memlock:
|
memlock:
|
||||||
soft: -1
|
soft: -1
|
||||||
hard: -1
|
hard: -1
|
||||||
mem_limit: 2g
|
mem_limit: 2g
|
||||||
|
|
||||||
|
|
||||||
kibana:
|
kibana:
|
||||||
image: wazuh/wazuh-kibana:3.9.2_7.1.1
|
image: wazuh/wazuh-kibana:3.9.3_7.2.0
|
||||||
hostname: kibana
|
hostname: kibana
|
||||||
restart: always
|
restart: always
|
||||||
depends_on:
|
depends_on:
|
||||||
@@ -49,7 +39,7 @@ services:
|
|||||||
- elasticsearch:elasticsearch
|
- elasticsearch:elasticsearch
|
||||||
- wazuh:wazuh
|
- wazuh:wazuh
|
||||||
nginx:
|
nginx:
|
||||||
image: wazuh/wazuh-nginx:3.9.2_7.1.1
|
image: wazuh/wazuh-nginx:3.9.3_7.2.0
|
||||||
hostname: nginx
|
hostname: nginx
|
||||||
restart: always
|
restart: always
|
||||||
environment:
|
environment:
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
|
# 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}
|
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"
|
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"
|
ENV ENABLE_CONFIGURE_S3="false"
|
||||||
|
|
||||||
ARG TEMPLATE_VERSION=v3.9.2
|
ARG TEMPLATE_VERSION=v3.9.3
|
||||||
|
|
||||||
# Elasticearch cluster configuration environment variables
|
# Elasticearch cluster configuration environment variables
|
||||||
# If ELASTIC_CLUSTER is set to "true" the following variables will be added to the Elasticsearch configuration
|
# If ELASTIC_CLUSTER is set to "true" the following variables will be added to the Elasticsearch configuration
|
||||||
|
|||||||
+3
-3
@@ -1,7 +1,7 @@
|
|||||||
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
|
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
|
||||||
FROM docker.elastic.co/kibana/kibana:7.1.1
|
FROM docker.elastic.co/kibana/kibana:7.2.0
|
||||||
ARG ELASTIC_VERSION=7.1.1
|
ARG ELASTIC_VERSION=7.2.0
|
||||||
ARG WAZUH_VERSION=3.9.2
|
ARG WAZUH_VERSION=3.9.3
|
||||||
ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
|
ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
|
||||||
|
|
||||||
USER root
|
USER root
|
||||||
|
|||||||
+3
-3
@@ -1,14 +1,14 @@
|
|||||||
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
|
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
|
||||||
FROM phusion/baseimage:latest
|
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" \
|
ENV API_USER="foo" \
|
||||||
API_PASS="bar"
|
API_PASS="bar"
|
||||||
|
|
||||||
ARG TEMPLATE_VERSION="v3.9.2"
|
ARG TEMPLATE_VERSION="v3.9.3"
|
||||||
|
|
||||||
# Set repositories.
|
# Set repositories.
|
||||||
RUN set -x && echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /etc/apt/sources.list.d/wazuh.list && \
|
RUN set -x && echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /etc/apt/sources.list.d/wazuh.list && \
|
||||||
|
|||||||
Reference in New Issue
Block a user