yahoo_1999/fk-wazuh
1
0
Fork 0
forked from wazuh/wazuh-docker
Code Pull Requests Activity

Merge branch 'main' of github.com:wazuh/wazuh-docker into merge-5.0.1-into-main

Browse Source
This commit is contained in:
Victor Carlos Erenu
2026-07-25 01:34:33 +07:00
parent 7228044200 d68ed9f6b7
commit 8e6e8e54ea
28 changed files with 90 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-docker-images/build-images.sh
+9 -9
View File
@@ -8,13 +8,13 @@
# License (version 2) as published by the FSF - Free Software
# Foundation.
WAZUH_IMAGE_VERSION=5.0.1
IMAGE_TAG=5.0.1
WAZUH_IMAGE_VERSION=5.1.0
IMAGE_TAG=5.1.0
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')
IMAGE_VERSION=${WAZUH_IMAGE_VERSION}
WAZUH_REGISTRY=docker.io
WAZUH_IMAGE_VERSION="5.0.1"
WAZUH_IMAGE_VERSION="5.1.0"
WAZUH_DEV_STAGE=""
WAZUH_COMPONENTS_COMMIT_LIST=''
IS_DEV_BUILD=""
@@ -38,9 +38,9 @@ ctrl_c() {
build() {
# WAZUH_MINOR_VERSION: Extracts major and minor version only (e.g., 5.0.1 -> 5.0)
# WAZUH_MINOR_VERSION: Extracts major and minor version only (e.g., 5.1.0 -> 5.0)
WAZUH_MINOR_VERSION="${WAZUH_IMAGE_VERSION%.*}"
# WAZUH_MAJOR_VERSION: Extracts major version only (e.g., 5.0.1 -> 5)
# WAZUH_MAJOR_VERSION: Extracts major version only (e.g., 5.1.0 -> 5)
WAZUH_MAJOR_VERSION="${WAZUH_IMAGE_VERSION%%.*}"
# WAZUH_STAGE: Extract the 'stage' (e.g., alpha0, beta1, rc2) from the local JSON metadata file.
# Note: This is primarily used for pre-release package naming.
@@ -192,10 +192,10 @@ build() {
# Generate per-component image tags.
# The commit suffix is only appended when --dev is passed. This ensures:
# dev=false, tag=5.0.1 → 5.0.1
# dev=false, tag=5.0.1-beta1 → 5.0.1-beta1
# dev=true, tag=5.0.1 → 5.0.1-latest
# dev=true, tag=5.0.1-beta1 → 5.0.1-beta1-latest
# dev=false, tag=5.1.0 → 5.1.0
# dev=false, tag=5.1.0-beta1 → 5.1.0-beta1
# dev=true, tag=5.1.0 → 5.1.0-latest
# dev=true, tag=5.1.0-beta1 → 5.1.0-beta1-latest
make_tag() {
local commit=$1
if [ -n "${IS_DEV_BUILD}" ]; then
build-docker-images/docker-bake.hcl
+2 -2
View File
@@ -12,7 +12,7 @@
# ── Global variables ──────────────────────────────────────────────────────────
variable "WAZUH_VERSION" { default = "5.0.1" }
variable "WAZUH_VERSION" { default = "5.1.0" }
variable "WAZUH_REGISTRY" { default = "docker.io" }
# Set IMAGE_TAG externally to override; defaults to WAZUH_VERSION.
@@ -23,7 +23,7 @@ variable "MULTIARCH" { default = "" }
# Per-component tags — all default to IMAGE_TAG.
# In dev builds the shell script sets each one independently to append the
# per-component commit ref (e.g. MANAGER_TAG=5.0.1-beta1-abc1234).
# per-component commit ref (e.g. MANAGER_TAG=5.1.0-beta1-abc1234).
variable "INDEXER_TAG" { default = IMAGE_TAG }
variable "MANAGER_TAG" { default = IMAGE_TAG }
variable "DASHBOARD_TAG" { default = IMAGE_TAG }