mirror of
				https://github.com/wazuh/wazuh-docker.git
				synced 2025-11-04 14:03:24 +00:00 
			
		
		
		
	Compare commits
	
		
			4 Commits
		
	
	
		
			v4.1.0
			...
			3.10.0_7.3
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					bbb575d5f3 | ||
| 
						 | 
					41f2ede382 | ||
| 
						 | 
					32298f694e | ||
| 
						 | 
					7e281658b9 | 
@@ -1,6 +1,12 @@
 | 
				
			|||||||
# 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.10.0_7.3.2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Added
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- Update to Wazuh version 3.10.0_7.3.2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
## Wazuh Docker v3.9.5_7.2.1
 | 
					## Wazuh Docker v3.9.5_7.2.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.5_7.2.1) 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
 | 
					## Credits and Thank you
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										4
									
								
								VERSION
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								VERSION
									
									
									
									
									
								
							@@ -1,2 +1,2 @@
 | 
				
			|||||||
WAZUH-DOCKER_VERSION="3.9.5_7.2.1"
 | 
					WAZUH-DOCKER_VERSION="3.10.0_7.3.2"
 | 
				
			||||||
REVISION="3950"
 | 
					REVISION="31000"
 | 
				
			||||||
@@ -3,7 +3,7 @@ version: '2'
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
services:
 | 
					services:
 | 
				
			||||||
  wazuh:
 | 
					  wazuh:
 | 
				
			||||||
    image: wazuh/wazuh:3.9.5_7.2.1
 | 
					    image: wazuh/wazuh:3.10.0_7.3.2
 | 
				
			||||||
    hostname: wazuh-manager
 | 
					    hostname: wazuh-manager
 | 
				
			||||||
    restart: always
 | 
					    restart: always
 | 
				
			||||||
    ports:
 | 
					    ports:
 | 
				
			||||||
@@ -13,7 +13,7 @@ services:
 | 
				
			|||||||
      - "55000:55000"
 | 
					      - "55000:55000"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  elasticsearch:
 | 
					  elasticsearch:
 | 
				
			||||||
    image: wazuh/wazuh-elasticsearch:3.9.5_7.2.1
 | 
					    image: wazuh/wazuh-elasticsearch:3.10.0_7.3.2
 | 
				
			||||||
    hostname: elasticsearch
 | 
					    hostname: elasticsearch
 | 
				
			||||||
    restart: always
 | 
					    restart: always
 | 
				
			||||||
    ports:
 | 
					    ports:
 | 
				
			||||||
@@ -30,7 +30,7 @@ services:
 | 
				
			|||||||
    mem_limit: 2g
 | 
					    mem_limit: 2g
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  kibana:
 | 
					  kibana:
 | 
				
			||||||
    image: wazuh/wazuh-kibana:3.9.5_7.2.1
 | 
					    image: wazuh/wazuh-kibana:3.10.0_7.3.2
 | 
				
			||||||
    hostname: kibana
 | 
					    hostname: kibana
 | 
				
			||||||
    restart: always
 | 
					    restart: always
 | 
				
			||||||
    depends_on:
 | 
					    depends_on:
 | 
				
			||||||
@@ -39,7 +39,7 @@ services:
 | 
				
			|||||||
      - elasticsearch:elasticsearch
 | 
					      - elasticsearch:elasticsearch
 | 
				
			||||||
      - wazuh:wazuh
 | 
					      - wazuh:wazuh
 | 
				
			||||||
  nginx:
 | 
					  nginx:
 | 
				
			||||||
    image: wazuh/wazuh-nginx:3.9.5_7.2.1
 | 
					    image: wazuh/wazuh-nginx:3.10.0_7.3.2
 | 
				
			||||||
    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.3.0
 | 
					ARG ELASTIC_VERSION=7.3.2
 | 
				
			||||||
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.5
 | 
					ARG TEMPLATE_VERSION=v3.10.0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# 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
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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.3.0
 | 
					FROM docker.elastic.co/kibana/kibana:7.3.2
 | 
				
			||||||
ARG ELASTIC_VERSION=7.3.0
 | 
					ARG ELASTIC_VERSION=7.3.2
 | 
				
			||||||
ARG WAZUH_VERSION=3.9.5
 | 
					ARG WAZUH_VERSION=3.10.0
 | 
				
			||||||
ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
 | 
					ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
USER root
 | 
					USER root
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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.3.0
 | 
					ARG FILEBEAT_VERSION=7.3.2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ARG WAZUH_VERSION=3.9.5-1
 | 
					ARG WAZUH_VERSION=3.10.0-1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ENV API_USER="foo" \
 | 
					ENV API_USER="foo" \
 | 
				
			||||||
   API_PASS="bar"
 | 
					   API_PASS="bar"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ARG TEMPLATE_VERSION="v3.9.5"
 | 
					ARG TEMPLATE_VERSION="v3.10.0"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# 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