Compare commits

..

11 Commits

Author SHA1 Message Date
Gonzalo Acuña
15a856dc32 Merge pull request #1489 from wazuh/enhancement/1485-revert-image-tag
Revert image tag
2024-08-19 12:03:40 -03:00
vcerenu
1486b5942c Revert image tag 2024-08-19 11:52:49 -03:00
Gonzalo Acuña
25319ee004 Merge pull request #1488 from wazuh/enhancement/1485-change-image-tag
Change image tag to RC1
2024-08-19 11:46:15 -03:00
vcerenu
f47ca7fbc0 Change image tag 2024-08-19 11:39:03 -03:00
Gonzalo Acuña
5ef94b819c Merge pull request #1487 from wazuh/enhancement/1485-fix-changelog-link
Fix changelog links
2024-08-19 11:29:20 -03:00
vcerenu
e77ceb6ad6 Fix changelog links 2024-08-19 11:16:06 -03:00
Gonzalo Acuña
127e74296a Merge pull request #1486 from wazuh/enhancement/1485-bump-revision
Bump 4.8.2 revision to 40819
2024-08-19 11:05:28 -03:00
vcerenu
0aa63db271 Bump REVISION to 40819 2024-08-19 10:50:11 -03:00
Carlos Bordon
583f75176d Merge pull request #1484 from wazuh/bump-4.8.2-to-4.8.2
Bump 4.8.2 branch to 4.8.2 version
2024-08-16 07:10:47 -03:00
c-bordon
11d2c84203 Fixed goos.yaml file 2024-08-16 07:09:50 -03:00
c-bordon
2e52ebd7b7 Bump 4.8.2 branch to 4.8.2 version 2024-08-16 06:48:46 -03:00
9 changed files with 25 additions and 19 deletions

6
.env
View File

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

2
.github/.goss.yaml vendored
View File

@@ -56,7 +56,7 @@ package:
wazuh-manager: wazuh-manager:
installed: true installed: true
versions: versions:
- 4.8.1 - 4.8.2
port: port:
tcp:1514: tcp:1514:
listening: true listening: true

View File

@@ -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 v4.8.2
### Added
- Update Wazuh to version [4.8.2](https://github.com/wazuh/wazuh/blob/v4.8.2/CHANGELOG.md#v482)
## Wazuh Docker v4.8.1 ## Wazuh Docker v4.8.1
### Added ### Added

View File

@@ -192,6 +192,7 @@ WAZUH_MONITORING_REPLICAS=0 ##
| Wazuh version | ODFE | XPACK | | Wazuh version | ODFE | XPACK |
|---------------|---------|--------| |---------------|---------|--------|
| v4.8.2 | | |
| v4.8.1 | | | | v4.8.1 | | |
| v4.8.0 | | | | v4.8.0 | | |
| v4.7.5 | | | | v4.7.5 | | |

View File

@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="4.8.1" WAZUH-DOCKER_VERSION="4.8.2"
REVISION="40817" REVISION="40819"

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: 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.8.1 $ build-docker-images/build-images.sh -v 4.8.2
``` ```
To get all the available script options use the -h or --help option: 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. -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. -f, --filebeat-module <ref> [Optional] Set Filebeat module version. By default 0.4.
-r, --revision <rev> [Optional] Package revision. By default 1 -r, --revision <rev> [Optional] Package revision. By default 1
-v, --version <ver> [Optional] Set the Wazuh version should be builded. By default, 4.8.1. -v, --version <ver> [Optional] Set the Wazuh version should be builded. By default, 4.8.2.
-h, --help Show this help. -h, --help Show this help.
``` ```

View File

@@ -1,4 +1,4 @@
WAZUH_IMAGE_VERSION=4.8.1 WAZUH_IMAGE_VERSION=4.8.2
WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g') WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g')
WAZUH_TAG_REVISION=1 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') 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 # License (version 2) as published by the FSF - Free Software
# Foundation. # Foundation.
WAZUH_IMAGE_VERSION="4.8.1" WAZUH_IMAGE_VERSION="4.8.2"
WAZUH_TAG_REVISION="1" WAZUH_TAG_REVISION="1"
WAZUH_DEV_STAGE="" WAZUH_DEV_STAGE=""
FILEBEAT_MODULE_VERSION="0.4" FILEBEAT_MODULE_VERSION="0.4"

View File

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

View File

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