paulmataruso/wazuh-docker-mirror
1
0
Fork 0
mirror of https://github.com/wazuh/wazuh-docker.git synced 2025-10-23 04:51:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve conflicts

Browse Source
This commit is contained in:
vcerenu
2024-10-17 12:33:13 -03:00
parent f4e7d1938d 46d6dc8fe5
commit 42977e3131
10 changed files with 45 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.env
View File

@@ -1,6 +1,6 @@
WAZUH_VERSION=4.10.0
WAZUH_IMAGE_VERSION=4.10.0
WAZUH_VERSION=4.10.1
WAZUH_IMAGE_VERSION=4.10.1
WAZUH_TAG_REVISION=1
FILEBEAT_TEMPLATE_BRANCH=4.10.0
FILEBEAT_TEMPLATE_BRANCH=4.10.1
WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.4.tar.gz
WAZUH_UI_REVISION=1

2
.github/.goss.yaml vendored
View File

@@ -56,7 +56,7 @@ package:
wazuh-manager:
installed: true
versions:
- 4.10.0-1
- 4.10.1-1
port:
tcp:1514:
listening: true

8
.github/workflows/Procedure_push_docker_images.yml vendored
View File

@@ -6,13 +6,19 @@ on:
inputs:
image_tag:
description: 'Docker image tag'
default: '4.10.0'
default: '4.10.1'
required: true
docker_reference:
description: 'wazuh-docker reference'
<<<<<<< HEAD
default: 'v4.10.0'
required: false
products:
=======
default: 'v4.10.1'
required: true
PRODUCTS:
>>>>>>> 46d6dc8fe58467e679fc57a86a5fe99394628b87
description: 'Comma-separated list of the image names to build and push'
default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer'
required: true

18
CHANGELOG.md
View File

@@ -1,6 +1,24 @@
# Change Log
All notable changes to this project will be documented in this file.
## [4.10.1]
### Added
- none
### Changed
- None
### Fixed
- None
### Deleted
- None
## [4.10.0]
### Added

1
README.md
View File

@@ -178,6 +178,7 @@ WAZUH_MONITORING_REPLICAS=0 ##
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.10.1 | | |
| v4.10.0 | | |
| v4.9.1 | | |
| v4.9.0 | | |

4
VERSION
View File

@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="4.10.0"
REVISION="41002"
WAZUH-DOCKER_VERSION="4.10.1"
REVISION="41010"

4
build-docker-images/README.md
View File

@@ -13,7 +13,7 @@ This script initializes the environment variables needed to build each of the im
The script allows you to build images from other versions of Wazuh, to do this you must use the -v or --version argument:
```
$ build-docker-images/build-images.sh -v 4.10.0
$ build-docker-images/build-images.sh -v 4.10.1
```
To get all the available script options use the -h or --help option:
@@ -26,7 +26,7 @@ Usage: build-docker-images/build-images.sh [OPTIONS]
-d, --dev <ref> [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default.
-f, --filebeat-module <ref> [Optional] Set Filebeat module version. By default 0.4.
-r, --revision <rev> [Optional] Package revision. By default 1
-v, --version <ver> [Optional] Set the Wazuh version should be builded. By default, 4.10.0.
-v, --version <ver> [Optional] Set the Wazuh version should be builded. By default, 4.10.1.
-h, --help Show this help.
```

4
build-docker-images/build-images.sh
View File

@@ -1,4 +1,4 @@
WAZUH_IMAGE_VERSION=4.10.0
WAZUH_IMAGE_VERSION=4.10.1
WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g')
WAZUH_TAG_REVISION=1
WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '["]tag_name["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g')
@@ -12,7 +12,7 @@ IMAGE_VERSION=${WAZUH_IMAGE_VERSION}
# License (version 2) as published by the FSF - Free Software
# Foundation.
WAZUH_IMAGE_VERSION="4.10.0"
WAZUH_IMAGE_VERSION="4.10.1"
WAZUH_TAG_REVISION="1"
WAZUH_DEV_STAGE=""
FILEBEAT_MODULE_VERSION="0.4"

12
multi-node/docker-compose.yml
View File

@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.master:
image: wazuh/wazuh-manager:4.10.0
image: wazuh/wazuh-manager:4.10.1
hostname: wazuh.master
restart: always
ulimits:
@@ -45,7 +45,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.worker:
image: wazuh/wazuh-manager:4.10.0
image: wazuh/wazuh-manager:4.10.1
hostname: wazuh.worker
restart: always
ulimits:
@@ -81,7 +81,7 @@ services:
- ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
wazuh1.indexer:
image: wazuh/wazuh-indexer:4.10.0
image: wazuh/wazuh-indexer:4.10.1
hostname: wazuh1.indexer
restart: always
ports:
@@ -107,7 +107,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh2.indexer:
image: wazuh/wazuh-indexer:4.10.0
image: wazuh/wazuh-indexer:4.10.1
hostname: wazuh2.indexer
restart: always
environment:
@@ -129,7 +129,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh3.indexer:
image: wazuh/wazuh-indexer:4.10.0
image: wazuh/wazuh-indexer:4.10.1
hostname: wazuh3.indexer
restart: always
environment:
@@ -151,7 +151,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.10.0
image: wazuh/wazuh-dashboard:4.10.1
hostname: wazuh.dashboard
restart: always
ports:

6
single-node/docker-compose.yml
View File

@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.manager:
image: wazuh/wazuh-manager:4.10.0
image: wazuh/wazuh-manager:4.10.1
hostname: wazuh.manager
restart: always
ulimits:
@@ -46,7 +46,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.indexer:
image: wazuh/wazuh-indexer:4.10.0
image: wazuh/wazuh-indexer:4.10.1
hostname: wazuh.indexer
restart: always
ports:
@@ -71,7 +71,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.10.0
image: wazuh/wazuh-dashboard:4.10.1
hostname: wazuh.dashboard
restart: always
ports: