Compare commits

..
Author SHA1 Message Date
Gonzalo Acuña f9abf8d672 Merge pull request #2307 from wazuh/enhancement/35457-new-stage-v5.0.0-beta1
New stage v5.0.0-beta1
2026-04-15 16:25:52 -03:00
Victor Carlos Erenu e36a96dea8 New stage v5.0.0-beta1 2026-04-16 02:23:46 +07:00
Gonzalo Acuña 4556f5b87e Merge pull request #2306 from wazuh/bug/35457-image-build
Artifact URL download fix
2026-04-15 16:15:14 -03:00
Gonzalo Acuña cf2f21baea Changelog update 2026-04-15 16:10:35 -03:00
Gonzalo Acuña fa4c3ec687 Artifact URL download fix 2026-04-15 16:02:43 -03:00
Gonzalo Acuña c2e87d4d0a Merge pull request #2293 from wazuh/change/2276-set_as_main-option
Add set_as_main option
2026-04-15 13:48:21 -03:00
Gonzalo Acuña b976edbb2c Merge pull request #2305 from wazuh/enhancement/2303-revert-new-stage-on-main-branch
Enhancement/2303 revert new stage on main branch
2026-04-15 09:26:23 -03:00
Victor Carlos Erenu 2b7f8200e6 Revert stage beta1 on main branch 2026-04-15 19:22:37 +07:00
Victor Carlos Erenu d173a3b1ea Revert stage beta1 on main branch 2026-04-15 19:20:12 +07:00
Carlos Bordon ab1e5b936d Merge pull request #2304 from wazuh/enhancement/2303-support-new-stage-v5.0.0-beta1
Support new stage beta1
2026-04-15 09:08:45 -03:00
Victor Carlos Erenu 5bc782a5ed Bump image_tag input 2026-04-15 19:01:18 +07:00
Victor Carlos Erenu d5e2b7a948 Add newline on version.json 2026-04-15 18:49:55 +07:00
Victor Carlos Erenu f7fc2108e4 Support new stage beta1 2026-04-15 18:39:32 +07:00
Victor Carlos Erenu 84612f5231 Add tag input 2026-04-15 03:13:05 +07:00
9 changed files with 21 additions and 19 deletions
+2 -2
View File
@@ -101,9 +101,9 @@ jobs:
# Both version and stage provided
if [[ -n "$version" && -n "$stage" && "$tag" != "true" ]]; then
script_params="--version ${version} --stage ${stage}"
script_params+=" --version ${version} --stage ${stage}"
elif [[ -n "$version" && -n "$stage" && "$tag" == "true" ]]; then
script_params="--version ${version} --stage ${stage} --tag ${tag}"
script_params+=" --version ${version} --stage ${stage} --tag ${tag}"
fi
issue_number=$(echo "${{ inputs.issue-link }}" | awk -F'/' '{print $NF}')
+1 -1
View File
@@ -44,7 +44,7 @@ jobs:
with:
image_tag: ${{ needs.prepare-variables.outputs.WAZUH_IMAGE_VERSION }}
docker_reference: ${{ github.head_ref || inputs.docker_reference }}
wazuh_automation_reference: 'main'
wazuh_automation_reference: 'v5.0.0-beta1'
commit_list: '["latest", "latest", "latest", "latest"]'
assistant_revision: 'latest'
id: ${{ github.run_id }}
@@ -6,7 +6,7 @@ on:
inputs:
image_tag:
description: 'Docker image tag'
default: '5.0.0'
default: '5.0.0-beta1'
required: true
docker_reference:
description: 'wazuh-docker reference'
@@ -14,7 +14,7 @@ on:
wazuh_automation_reference:
description: 'Branch or tag of the wazuh-automation repository'
required: false
default: 'main'
default: 'v5.0.0-beta1'
products:
description: 'Comma-separated list of the image names to build and push'
default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent'
@@ -42,7 +42,7 @@ on:
inputs:
image_tag:
description: 'Docker image tag'
default: '5.0.0'
default: '5.0.0-beta1'
required: true
type: string
docker_reference:
@@ -52,7 +52,7 @@ on:
wazuh_automation_reference:
description: 'Branch or tag of the wazuh-automation repository'
required: false
default: 'main'
default: 'v5.0.0-beta1'
type: string
products:
description: 'Comma-separated list of the image names to build and push'
+1
View File
@@ -48,6 +48,7 @@ All notable changes to this project will be documented in this file.
### Fixed
- Artifact URL download fix ([#2306](https://github.com/wazuh/wazuh-docker/pull/2306))
- Change API query method. ([#2275](https://github.com/wazuh/wazuh-docker/pull/2275))
- Change Wazuh manager Healthcheck. ([#2272](https://github.com/wazuh/wazuh-docker/pull/2272))
- Delete WAZUH_AGENT_GROUP variable. ([#2263](https://github.com/wazuh/wazuh-docker/pull/2263))
+1 -1
View File
@@ -1,4 +1,4 @@
{
"version": "5.0.0",
"stage": "alpha0"
"stage": "beta1"
}
+2 -1
View File
@@ -54,7 +54,7 @@ build() {
# Prepare logic to fetch the artifact from Wazuh's infrastructure
TAG="v${WAZUH_IMAGE_VERSION}"
REPO="wazuh/wazuh-docker"
GH_URL="https://api.github.com/repos/${REPO}/git/refs/tags/${TAG}"
GH_URL="https://api.github.com/repos/${REPO}/releases/tags/${TAG}"
# Use GitHub API to check if the tag exists publicly.
# This determines if we should look for production or staging artifacts.
@@ -70,6 +70,7 @@ build() {
PACKAGE_URL=packages-staging.xdrsiem.wazuh.info
RELEASE_STAGE=pre-release
fi
echo "Attempting to download artifacts from: https://${PACKAGE_URL}/${RELEASE_STAGE}/${WAZUH_MAJOR_VERSION}.x/${ARTIFACT_URLS_DOWNLOAD}"
# Final download using dynamic variables based on the release type.
# Pattern: server / stage / major_version.x / filename
curl -fsSL -o "$ARTIFACT_URLS_FILE" "https://${PACKAGE_URL}/${RELEASE_STAGE}/${WAZUH_MAJOR_VERSION}.x/${ARTIFACT_URLS_DOWNLOAD}"
+6 -6
View File
@@ -1,7 +1,7 @@
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
services:
wazuh.master:
image: wazuh/wazuh-manager:5.0.0
image: wazuh/wazuh-manager:5.0.0-beta1
hostname: wazuh.master
container_name: multi-node-wazuh.master
restart: always
@@ -43,7 +43,7 @@ services:
- ./config/wazuh_master/certs/wazuh.master-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem
wazuh.worker:
image: wazuh/wazuh-manager:5.0.0
image: wazuh/wazuh-manager:5.0.0-beta1
hostname: wazuh.worker
container_name: multi-node-wazuh.worker
restart: always
@@ -82,7 +82,7 @@ services:
- ./config/wazuh_worker/certs/wazuh.worker-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem
wazuh1.indexer:
image: wazuh/wazuh-indexer:5.0.0
image: wazuh/wazuh-indexer:5.0.0-beta1
hostname: wazuh1.indexer
container_name: multi-node-wazuh1.indexer
restart: always
@@ -120,7 +120,7 @@ services:
- ./config/wazuh1_indexer/certs/admin-key.pem:/usr/share/wazuh-indexer/config/certs/admin-key.pem
wazuh2.indexer:
image: wazuh/wazuh-indexer:5.0.0
image: wazuh/wazuh-indexer:5.0.0-beta1
hostname: wazuh2.indexer
container_name: multi-node-wazuh2.indexer
restart: always
@@ -158,7 +158,7 @@ services:
- ./config/wazuh2_indexer/certs/wazuh2.indexer.pem:/usr/share/wazuh-indexer/config/certs/indexer.pem
wazuh3.indexer:
image: wazuh/wazuh-indexer:5.0.0
image: wazuh/wazuh-indexer:5.0.0-beta1
hostname: wazuh3.indexer
container_name: multi-node-wazuh3.indexer
restart: always
@@ -196,7 +196,7 @@ services:
- ./config/wazuh3_indexer/certs/wazuh3.indexer.pem:/usr/share/wazuh-indexer/config/certs/indexer.pem
wazuh.dashboard:
image: wazuh/wazuh-dashboard:5.0.0
image: wazuh/wazuh-dashboard:5.0.0-beta1
hostname: wazuh.dashboard
container_name: multi-node-wazuh.dashboard
restart: always
+3 -3
View File
@@ -1,7 +1,7 @@
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
services:
wazuh.manager:
image: wazuh/wazuh-manager:5.0.0
image: wazuh/wazuh-manager:5.0.0-beta1
hostname: wazuh.manager
container_name: single-node-wazuh.manager
restart: always
@@ -43,7 +43,7 @@ services:
- ./config/wazuh_manager/certs/wazuh.manager-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem
wazuh.indexer:
image: wazuh/wazuh-indexer:5.0.0
image: wazuh/wazuh-indexer:5.0.0-beta1
hostname: wazuh.indexer
container_name: single-node-wazuh.indexer
restart: always
@@ -80,7 +80,7 @@ services:
- ./config/wazuh_indexer/certs/admin-key.pem:/usr/share/wazuh-indexer/config/certs/admin-key.pem
wazuh.dashboard:
image: wazuh/wazuh-dashboard:5.0.0
image: wazuh/wazuh-dashboard:5.0.0-beta1
hostname: wazuh.dashboard
container_name: single-node-wazuh.dashboard
restart: always
+1 -1
View File
@@ -1,7 +1,7 @@
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
services:
wazuh.agent:
image: wazuh/wazuh-agent:5.0.0
image: wazuh/wazuh-agent:5.0.0-beta1
restart: always
environment:
- WAZUH_MANAGER_SERVER=<WAZUH_MANAGER_IP>