Compare commits

...

6 Commits

Author SHA1 Message Date
Victor Ereñú
8814200fb2 Merge pull request #1165 from wazuh/bump-revision
Bump revision
2023-12-22 18:59:26 +10:00
vcerenu
69d61278cf bump revision 2023-12-22 05:46:46 -03:00
Gonzalo Acuña
ca8cf4f717 Merge pull request #1159 from wazuh/merge-4.7.1-into-4.7.2
Merge 4.7.1 into 4.7.2
2023-12-20 14:13:11 -03:00
David Correa Rodríguez
2c92c87b02 Merge branch '4.7.1' into merge-4.7.1-into-4.7.2 2023-12-20 17:38:00 +01:00
Victor Ereñú
3d58ff0049 Merge pull request #1141 from wazuh/bump-revision
Support new Wazuh version 4.7.2 in wazuh-docker repository
2023-11-30 19:21:17 +10:00
vcerenu
d44b87800a bump revision number 2023-11-30 06:11:07 -03:00
9 changed files with 23 additions and 17 deletions

4
.env
View File

@@ -1,3 +1,3 @@
WAZUH_VERSION=4.7.1
WAZUH_IMAGE_VERSION=4.7.1
WAZUH_VERSION=4.7.2
WAZUH_IMAGE_VERSION=4.7.2
WAZUH_TAG_REVISION=1

2
.github/.goss.yaml vendored
View File

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

View File

@@ -1,6 +1,11 @@
# Change Log
All notable changes to this project will be documented in this file.
## Wazuh Docker v4.7.2
### Added
- Update Wazuh to version [4.7.2](https://github.com/wazuh/wazuh/blob/v4.7.2/CHANGELOG.md#v472)
## Wazuh Docker v4.7.1
### Added

View File

@@ -195,6 +195,7 @@ WAZUH_MONITORING_REPLICAS=0 ##
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.7.2 | | |
| v4.7.1 | | |
| v4.7.0 | | |
| v4.6.0 | | |

View File

@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="4.7.1"
REVISION="40709"
WAZUH-DOCKER_VERSION="4.7.2"
REVISION="40710"

View File

@@ -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.3.
-r, --revision <rev> [Optional] Package revision. By default 1
-v, --version <ver> [Optional] Set the Wazuh version should be builded. By default, 4.7.1.
-v, --version <ver> [Optional] Set the Wazuh version should be builded. By default, 4.7.2.
-h, --help Show this help.
```

View File

@@ -1,4 +1,4 @@
WAZUH_IMAGE_VERSION=4.7.1
WAZUH_IMAGE_VERSION=4.7.2
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.7.1"
WAZUH_IMAGE_VERSION="4.7.2"
WAZUH_TAG_REVISION="1"
WAZUH_DEV_STAGE=""
FILEBEAT_MODULE_VERSION="0.3"

View File

@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.master:
image: wazuh/wazuh-manager:4.7.1
image: wazuh/wazuh-manager:4.7.2
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.7.1
image: wazuh/wazuh-manager:4.7.2
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.7.1
image: wazuh/wazuh-indexer:4.7.2
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.7.1
image: wazuh/wazuh-indexer:4.7.2
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.7.1
image: wazuh/wazuh-indexer:4.7.2
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.7.1
image: wazuh/wazuh-dashboard:4.7.2
hostname: wazuh.dashboard
restart: always
ports:

View File

@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh.manager:
image: wazuh/wazuh-manager:4.7.1
image: wazuh/wazuh-manager:4.7.2
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.7.1
image: wazuh/wazuh-indexer:4.7.2
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.7.1
image: wazuh/wazuh-dashboard:4.7.2
hostname: wazuh.dashboard
restart: always
ports: