mirror of
				https://github.com/wazuh/wazuh-docker.git
				synced 2025-11-03 21:43:17 +00:00 
			
		
		
		
	Compare commits
	
		
			13 Commits
		
	
	
		
			v3.9.3_7.2
			...
			3.10.0_7.3
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					bbb575d5f3 | ||
| 
						 | 
					41f2ede382 | ||
| 
						 | 
					32298f694e | ||
| 
						 | 
					7e281658b9 | ||
| 
						 | 
					57e71d5545 | ||
| 
						 | 
					6d393f976a | ||
| 
						 | 
					f7eaf56691 | ||
| 
						 | 
					2c9c0f6cea | ||
| 
						 | 
					c2f43d0d29 | ||
| 
						 | 
					a2dd5867a1 | ||
| 
						 | 
					adc4efb694 | ||
| 
						 | 
					62e39920cd | ||
| 
						 | 
					2a77c6a6e6 | 
							
								
								
									
										19
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										19
									
								
								CHANGELOG.md
									
									
									
									
									
								
							@@ -1,6 +1,25 @@
 | 
			
		||||
# Change Log
 | 
			
		||||
All notable changes to this project will be documented in this file.
 | 
			
		||||
 | 
			
		||||
## Wazuh Docker v3.10.0_7.3.2
 | 
			
		||||
 | 
			
		||||
### Added
 | 
			
		||||
 | 
			
		||||
- Update to Wazuh version 3.10.0_7.3.2
 | 
			
		||||
 | 
			
		||||
## Wazuh Docker v3.9.5_7.2.1
 | 
			
		||||
 | 
			
		||||
### Added
 | 
			
		||||
 | 
			
		||||
- Update to Wazuh version 3.9.5_7.2.1
 | 
			
		||||
 | 
			
		||||
## Wazuh Docker v3.9.4_7.2.0
 | 
			
		||||
 | 
			
		||||
### Added
 | 
			
		||||
 | 
			
		||||
- Update to Wazuh version 3.9.4_7.2.0
 | 
			
		||||
- Implemented Wazuh Filebeat Module ([jm404](https://www.github.com/jm404)) [#2a77c6a](https://github.com/wazuh/wazuh-docker/commit/2a77c6a6e6bf78f2492adeedbade7a507d9974b2)
 | 
			
		||||
 | 
			
		||||
## Wazuh Docker v3.9.3_7.2.0
 | 
			
		||||
 | 
			
		||||
### Fixed
 | 
			
		||||
 
 | 
			
		||||
@@ -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.
 | 
			
		||||
* `master` branch contains the latest code, be aware of possible bugs on 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.
 | 
			
		||||
* `Wazuh.Version_ElasticStack.Version` (for example 3.10.0_7.3.2) 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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								VERSION
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								VERSION
									
									
									
									
									
								
							@@ -1,2 +1,2 @@
 | 
			
		||||
WAZUH-DOCKER_VERSION="3.9.3_7.2.0"
 | 
			
		||||
REVISION="3930"
 | 
			
		||||
WAZUH-DOCKER_VERSION="3.10.0_7.3.2"
 | 
			
		||||
REVISION="31000"
 | 
			
		||||
@@ -3,7 +3,7 @@ version: '2'
 | 
			
		||||
 | 
			
		||||
services:
 | 
			
		||||
  wazuh:
 | 
			
		||||
    image: wazuh/wazuh:3.9.3_7.2.0
 | 
			
		||||
    image: wazuh/wazuh:3.10.0_7.3.2
 | 
			
		||||
    hostname: wazuh-manager
 | 
			
		||||
    restart: always
 | 
			
		||||
    ports:
 | 
			
		||||
@@ -13,7 +13,7 @@ services:
 | 
			
		||||
      - "55000:55000"
 | 
			
		||||
 | 
			
		||||
  elasticsearch:
 | 
			
		||||
    image: wazuh/wazuh-elasticsearch:3.9.3_7.2.0
 | 
			
		||||
    image: wazuh/wazuh-elasticsearch:3.10.0_7.3.2
 | 
			
		||||
    hostname: elasticsearch
 | 
			
		||||
    restart: always
 | 
			
		||||
    ports:
 | 
			
		||||
@@ -30,7 +30,7 @@ services:
 | 
			
		||||
    mem_limit: 2g
 | 
			
		||||
 | 
			
		||||
  kibana:
 | 
			
		||||
    image: wazuh/wazuh-kibana:3.9.3_7.2.0
 | 
			
		||||
    image: wazuh/wazuh-kibana:3.10.0_7.3.2
 | 
			
		||||
    hostname: kibana
 | 
			
		||||
    restart: always
 | 
			
		||||
    depends_on:
 | 
			
		||||
@@ -39,7 +39,7 @@ services:
 | 
			
		||||
      - elasticsearch:elasticsearch
 | 
			
		||||
      - wazuh:wazuh
 | 
			
		||||
  nginx:
 | 
			
		||||
    image: wazuh/wazuh-nginx:3.9.3_7.2.0
 | 
			
		||||
    image: wazuh/wazuh-nginx:3.10.0_7.3.2
 | 
			
		||||
    hostname: nginx
 | 
			
		||||
    restart: always
 | 
			
		||||
    environment:
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,5 @@
 | 
			
		||||
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 | 
			
		||||
ARG ELASTIC_VERSION=7.2.0
 | 
			
		||||
ARG ELASTIC_VERSION=7.3.2
 | 
			
		||||
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"
 | 
			
		||||
 | 
			
		||||
@@ -15,7 +15,7 @@ ENV XPACK_ML="true"
 | 
			
		||||
 | 
			
		||||
ENV ENABLE_CONFIGURE_S3="false"
 | 
			
		||||
 | 
			
		||||
ARG TEMPLATE_VERSION=v3.9.3
 | 
			
		||||
ARG TEMPLATE_VERSION=v3.10.0
 | 
			
		||||
 | 
			
		||||
# Elasticearch cluster configuration environment variables
 | 
			
		||||
# If ELASTIC_CLUSTER is set to "true" the following variables will be added to the Elasticsearch configuration
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 | 
			
		||||
FROM docker.elastic.co/kibana/kibana:7.2.0
 | 
			
		||||
ARG ELASTIC_VERSION=7.2.0
 | 
			
		||||
ARG WAZUH_VERSION=3.9.3
 | 
			
		||||
FROM docker.elastic.co/kibana/kibana:7.3.2
 | 
			
		||||
ARG ELASTIC_VERSION=7.3.2
 | 
			
		||||
ARG WAZUH_VERSION=3.10.0
 | 
			
		||||
ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
 | 
			
		||||
 | 
			
		||||
USER root
 | 
			
		||||
 
 | 
			
		||||
@@ -1,14 +1,14 @@
 | 
			
		||||
# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 | 
			
		||||
FROM phusion/baseimage:latest
 | 
			
		||||
 | 
			
		||||
ARG FILEBEAT_VERSION=7.2.0
 | 
			
		||||
ARG FILEBEAT_VERSION=7.3.2
 | 
			
		||||
 | 
			
		||||
ARG WAZUH_VERSION=3.9.3-1
 | 
			
		||||
ARG WAZUH_VERSION=3.10.0-1
 | 
			
		||||
 | 
			
		||||
ENV API_USER="foo" \
 | 
			
		||||
   API_PASS="bar"
 | 
			
		||||
 | 
			
		||||
ARG TEMPLATE_VERSION="v3.9.3"
 | 
			
		||||
ARG TEMPLATE_VERSION="v3.10.0"
 | 
			
		||||
 | 
			
		||||
# Set repositories.
 | 
			
		||||
RUN set -x && echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /etc/apt/sources.list.d/wazuh.list && \
 | 
			
		||||
 
 | 
			
		||||
@@ -3,8 +3,17 @@
 | 
			
		||||
 | 
			
		||||
set -e
 | 
			
		||||
 | 
			
		||||
WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.1.tar.gz
 | 
			
		||||
 | 
			
		||||
# Modify the output to Elasticsearch if th ELASTICSEARCH_URL is set
 | 
			
		||||
if [ "$ELASTICSEARCH_URL" != "" ]; then
 | 
			
		||||
  >&2 echo "Customize Elasticsearch ouput IP."
 | 
			
		||||
  sed -i 's|http://elasticsearch:9200|'$ELASTICSEARCH_URL'|g' /etc/filebeat/filebeat.yml
 | 
			
		||||
fi
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
# Install Wazuh Filebeat Module
 | 
			
		||||
 | 
			
		||||
curl -s "https://packages.wazuh.com/3.x/filebeat/${WAZUH_FILEBEAT_MODULE}" | tar -xvz -C /usr/share/filebeat/module
 | 
			
		||||
mkdir -p /usr/share/filebeat/module/wazuh
 | 
			
		||||
chmod 755 -R /usr/share/filebeat/module/wazuh
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user