Resolving conflicts

This commit is contained in:
vcerenu
2025-08-14 08:56:57 -03:00
36 changed files with 90 additions and 80 deletions
+2 -5
View File
@@ -1,4 +1,4 @@
WAZUH_IMAGE_VERSION=4.14.1
WAZUH_IMAGE_VERSION=5.0.0
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,11 +12,8 @@ IMAGE_VERSION=${WAZUH_IMAGE_VERSION}
# License (version 2) as published by the FSF - Free Software
# Foundation.
WAZUH_IMAGE_VERSION="4.14.1"
WAZUH_TAG_REVISION="1"
WAZUH_DEV_STAGE=""
WAZUH_IMAGE_VERSION="5.0.0"
FILEBEAT_MODULE_VERSION="0.4"
# -----------------------------------------------------------------------------
trap ctrl_c INT