mirror of
				https://github.com/wazuh/wazuh-docker.git
				synced 2025-11-04 05:53:16 +00:00 
			
		
		
		
	Compare commits
	
		
			5 Commits
		
	
	
		
			v3.8.2_6.6
			...
			3.8.2_6.7.
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					61d3f460be | ||
| 
						 | 
					9ed503b6e8 | ||
| 
						 | 
					274d6248d3 | ||
| 
						 | 
					b47f723285 | ||
| 
						 | 
					b99d54eb25 | 
							
								
								
									
										12
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								CHANGELOG.md
									
									
									
									
									
								
							@@ -1,6 +1,18 @@
 | 
				
			|||||||
# 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.8.2_6.7.0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- Update Elastic Stack version to 6.7.0. ([#144](https://github.com/wazuh/wazuh-docker/pull/144))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## Wazuh Docker v3.8.2_6.6.2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- Update Elastic Stack version to 6.6.2. ([#130](https://github.com/wazuh/wazuh-docker/pull/130))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
## Wazuh Docker v3.8.2_6.6.1
 | 
					## Wazuh Docker v3.8.2_6.6.1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
### Changed
 | 
					### Changed
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -61,7 +61,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.8.2_6.6.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.8.2_6.7.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
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										4
									
								
								VERSION
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								VERSION
									
									
									
									
									
								
							@@ -1,2 +1,2 @@
 | 
				
			|||||||
WAZUH-DOCKER_VERSION="3.8.2_6.6.1"
 | 
					WAZUH-DOCKER_VERSION="3.8.2_6.7.0"
 | 
				
			||||||
REVISION="3802"
 | 
					REVISION="3803"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -3,7 +3,7 @@ version: '2'
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
services:
 | 
					services:
 | 
				
			||||||
  wazuh:
 | 
					  wazuh:
 | 
				
			||||||
    image: wazuh/wazuh:3.8.2_6.6.1
 | 
					    image: wazuh/wazuh:3.8.2_6.7.0
 | 
				
			||||||
    hostname: wazuh-manager
 | 
					    hostname: wazuh-manager
 | 
				
			||||||
    restart: always
 | 
					    restart: always
 | 
				
			||||||
    ports:
 | 
					    ports:
 | 
				
			||||||
@@ -14,7 +14,7 @@ services:
 | 
				
			|||||||
    depends_on:
 | 
					    depends_on:
 | 
				
			||||||
      - logstash
 | 
					      - logstash
 | 
				
			||||||
  logstash:
 | 
					  logstash:
 | 
				
			||||||
    image: wazuh/wazuh-logstash:3.8.2_6.6.1
 | 
					    image: wazuh/wazuh-logstash:3.8.2_6.7.0
 | 
				
			||||||
    hostname: logstash
 | 
					    hostname: logstash
 | 
				
			||||||
    restart: always
 | 
					    restart: always
 | 
				
			||||||
    links:
 | 
					    links:
 | 
				
			||||||
@@ -26,7 +26,7 @@ services:
 | 
				
			|||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
      - LS_HEAP_SIZE=2048m
 | 
					      - LS_HEAP_SIZE=2048m
 | 
				
			||||||
  elasticsearch:
 | 
					  elasticsearch:
 | 
				
			||||||
    image: wazuh/wazuh-elasticsearch:3.8.2_6.6.1
 | 
					    image: wazuh/wazuh-elasticsearch:3.8.2_6.7.0
 | 
				
			||||||
    hostname: elasticsearch
 | 
					    hostname: elasticsearch
 | 
				
			||||||
    restart: always
 | 
					    restart: always
 | 
				
			||||||
    ports:
 | 
					    ports:
 | 
				
			||||||
@@ -43,7 +43,7 @@ services:
 | 
				
			|||||||
        hard: -1
 | 
					        hard: -1
 | 
				
			||||||
    mem_limit: 2g
 | 
					    mem_limit: 2g
 | 
				
			||||||
  kibana:
 | 
					  kibana:
 | 
				
			||||||
    image: wazuh/wazuh-kibana:3.8.2_6.6.1
 | 
					    image: wazuh/wazuh-kibana:3.8.2_6.7.0
 | 
				
			||||||
    hostname: kibana
 | 
					    hostname: kibana
 | 
				
			||||||
    restart: always
 | 
					    restart: always
 | 
				
			||||||
    depends_on:
 | 
					    depends_on:
 | 
				
			||||||
@@ -52,7 +52,7 @@ services:
 | 
				
			|||||||
      - elasticsearch:elasticsearch
 | 
					      - elasticsearch:elasticsearch
 | 
				
			||||||
      - wazuh:wazuh
 | 
					      - wazuh:wazuh
 | 
				
			||||||
  nginx:
 | 
					  nginx:
 | 
				
			||||||
    image: wazuh/wazuh-nginx:3.8.2_6.6.1
 | 
					    image: wazuh/wazuh-nginx:3.8.2_6.7.0
 | 
				
			||||||
    hostname: nginx
 | 
					    hostname: nginx
 | 
				
			||||||
    restart: always
 | 
					    restart: always
 | 
				
			||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,5 +1,5 @@
 | 
				
			|||||||
# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 | 
					# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 | 
				
			||||||
FROM docker.elastic.co/elasticsearch/elasticsearch:6.6.1
 | 
					FROM docker.elastic.co/elasticsearch/elasticsearch:6.7.0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ENV ALERTS_SHARDS="1" \
 | 
					ENV ALERTS_SHARDS="1" \
 | 
				
			||||||
    ALERTS_REPLICAS="0"
 | 
					    ALERTS_REPLICAS="0"
 | 
				
			||||||
@@ -23,7 +23,7 @@ COPY --chown=elasticsearch:elasticsearch ./config/load_settings.sh ./
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
RUN chmod +x ./load_settings.sh
 | 
					RUN chmod +x ./load_settings.sh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
RUN elasticsearch-plugin install --batch repository-s3
 | 
					RUN bin/elasticsearch-plugin install --batch https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-6.7.0.zip
 | 
				
			||||||
 | 
					
 | 
				
			||||||
COPY config/configure_s3.sh ./config/configure_s3.sh
 | 
					COPY config/configure_s3.sh ./config/configure_s3.sh
 | 
				
			||||||
RUN chmod 755 ./config/configure_s3.sh
 | 
					RUN chmod 755 ./config/configure_s3.sh
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 | 
					# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 | 
				
			||||||
FROM docker.elastic.co/kibana/kibana:6.6.1
 | 
					FROM docker.elastic.co/kibana/kibana:6.7.0
 | 
				
			||||||
ARG WAZUH_APP_VERSION=3.8.2_6.6.1
 | 
					ARG WAZUH_APP_VERSION=3.8.2_6.7.0
 | 
				
			||||||
USER root
 | 
					USER root
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
 | 
					ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,5 +1,5 @@
 | 
				
			|||||||
# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 | 
					# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 | 
				
			||||||
FROM docker.elastic.co/logstash/logstash:6.6.1
 | 
					FROM docker.elastic.co/logstash/logstash:6.7.0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
COPY --chown=logstash:logstash config/entrypoint.sh /entrypoint.sh
 | 
					COPY --chown=logstash:logstash config/entrypoint.sh /entrypoint.sh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 | 
					# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
 | 
				
			||||||
FROM phusion/baseimage:latest
 | 
					FROM phusion/baseimage:latest
 | 
				
			||||||
ARG FILEBEAT_VERSION=6.6.1
 | 
					ARG FILEBEAT_VERSION=6.7.0
 | 
				
			||||||
ARG WAZUH_VERSION=3.8.2-1
 | 
					ARG WAZUH_VERSION=3.8.2-1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ENV API_USER="foo" \
 | 
					ENV API_USER="foo" \
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user