From ad71d8596d69fff914a4fe6d9a1efe548532708f Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Fri, 24 Apr 2026 19:55:07 +0700 Subject: [PATCH 1/3] Add new path on artifact_urls file --- build-docker-images/build-images.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index be5661d4..82639707 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -45,8 +45,9 @@ build() { # 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. WAZUH_STAGE=$(jq -r '.stage' ../VERSION.json) + FILE_NAME_URLS="artifact_urls" # ARTIFACT_URLS_FILE: The name of the artifact URLs file. - ARTIFACT_URLS_FILE="artifact_urls.yaml" + ARTIFACT_URLS_FILE="${FILE_NAME_URLS}.yaml" # Check if the artifact file already exists to prevent redundant downloads if [[ -f "$ARTIFACT_URLS_FILE" ]]; then @@ -64,7 +65,7 @@ build() { if [ "$HTTP_STATUS" -eq 200 ]; then # CASE: Production (Tag and Release exist) echo "Release $TAG found. Setting Production environment." - ARTIFACT_URLS_DOWNLOAD="artifact_urls_${WAZUH_IMAGE_VERSION}.yaml" + ARTIFACT_URLS_DOWNLOAD="${FILE_NAME_URLS}_${WAZUH_IMAGE_VERSION}.yaml" PACKAGE_URL="packages.wazuh.com" RELEASE_STAGE="production" elif [ "$HTTP_STATUS" -eq 403 ]; then @@ -74,9 +75,9 @@ build() { PACKAGE_URL="packages-staging.xdrsiem.wazuh.info" RELEASE_STAGE="pre-release" if [ -n "$WAZUH_STAGE" ] && [ "$WAZUH_STAGE" != "null" ]; then - ARTIFACT_URLS_DOWNLOAD="artifact_urls_${WAZUH_IMAGE_VERSION}-${WAZUH_STAGE}.yaml" + ARTIFACT_URLS_DOWNLOAD="${FILE_NAME_URLS}_${WAZUH_IMAGE_VERSION}-${WAZUH_STAGE}.yaml" else - ARTIFACT_URLS_DOWNLOAD="artifact_urls_${WAZUH_IMAGE_VERSION}.yaml" + ARTIFACT_URLS_DOWNLOAD="${FILE_NAME_URLS}_${WAZUH_IMAGE_VERSION}.yaml" fi else # CASE: Pre-release/Staging (404 Not Found or any other non-200 status) @@ -84,15 +85,15 @@ build() { PACKAGE_URL="packages-staging.xdrsiem.wazuh.info" RELEASE_STAGE="pre-release" if [ -n "$WAZUH_STAGE" ] && [ "$WAZUH_STAGE" != "null" ]; then - ARTIFACT_URLS_DOWNLOAD="artifact_urls_${WAZUH_IMAGE_VERSION}-${WAZUH_STAGE}.yaml" + ARTIFACT_URLS_DOWNLOAD="${FILE_NAME_URLS}_${WAZUH_IMAGE_VERSION}-${WAZUH_STAGE}.yaml" else - ARTIFACT_URLS_DOWNLOAD="artifact_urls_${WAZUH_IMAGE_VERSION}.yaml" + ARTIFACT_URLS_DOWNLOAD="${FILE_NAME_URLS}_${WAZUH_IMAGE_VERSION}.yaml" fi fi # Final download using dynamic variables based on the release type. # Pattern: server / stage / major_version.x / filename - FULL_URL="https://${PACKAGE_URL}/${RELEASE_STAGE}/${WAZUH_MAJOR_VERSION}.x/${ARTIFACT_URLS_DOWNLOAD}" + FULL_URL="https://${PACKAGE_URL}/${RELEASE_STAGE}/${WAZUH_MAJOR_VERSION}.x/${FILE_NAME_URLS}/${ARTIFACT_URLS_DOWNLOAD}" echo "Attempting to download: $FULL_URL" curl -fsSL -o "$ARTIFACT_URLS_FILE" "$FULL_URL" || { echo "Error: Failed to download artifact URLs from $FULL_URL" >&2 From 28fefbc5b6b15ea5230d19e740597dd07e5fce94 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Fri, 24 Apr 2026 22:52:01 +0700 Subject: [PATCH 2/3] Add changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 188d35aa..6aaab249 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file. ### Changed +- Add new path on artifact_urls file ([#2344](https://github.com/wazuh/wazuh-docker/pull/2344)) - Adapt bumper workflows to change main branch ([#2294](https://github.com/wazuh/wazuh-docker/pull/2294)) - Delete all API user and password references and Wazuh agent references ([#2289](https://github.com/wazuh/wazuh-docker/pull/2289)) - Create certificate directory with default user and group ([#2287](https://github.com/wazuh/wazuh-docker/pull/2287)) From ebbf3b585fd364dea1e81540e497d0cf72bb69f0 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Sat, 25 Apr 2026 01:32:02 +0700 Subject: [PATCH 3/3] Update artifact_urls directory path --- build-docker-images/build-images.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 82639707..ea4a6677 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -45,9 +45,10 @@ build() { # 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. WAZUH_STAGE=$(jq -r '.stage' ../VERSION.json) - FILE_NAME_URLS="artifact_urls" # ARTIFACT_URLS_FILE: The name of the artifact URLs file. - ARTIFACT_URLS_FILE="${FILE_NAME_URLS}.yaml" + ARTIFACT_URLS_FILE="artifact_urls.yaml" + # ARTIFACT_URLS_DIR: The name of the artifact URLs directory. + ARTIFACT_URLS_DIR="artifact_urls" # Check if the artifact file already exists to prevent redundant downloads if [[ -f "$ARTIFACT_URLS_FILE" ]]; then @@ -65,7 +66,7 @@ build() { if [ "$HTTP_STATUS" -eq 200 ]; then # CASE: Production (Tag and Release exist) echo "Release $TAG found. Setting Production environment." - ARTIFACT_URLS_DOWNLOAD="${FILE_NAME_URLS}_${WAZUH_IMAGE_VERSION}.yaml" + ARTIFACT_URLS_DOWNLOAD="artifact_urls_${WAZUH_IMAGE_VERSION}.yaml" PACKAGE_URL="packages.wazuh.com" RELEASE_STAGE="production" elif [ "$HTTP_STATUS" -eq 403 ]; then @@ -75,9 +76,9 @@ build() { PACKAGE_URL="packages-staging.xdrsiem.wazuh.info" RELEASE_STAGE="pre-release" if [ -n "$WAZUH_STAGE" ] && [ "$WAZUH_STAGE" != "null" ]; then - ARTIFACT_URLS_DOWNLOAD="${FILE_NAME_URLS}_${WAZUH_IMAGE_VERSION}-${WAZUH_STAGE}.yaml" + ARTIFACT_URLS_DOWNLOAD="artifact_urls_${WAZUH_IMAGE_VERSION}-${WAZUH_STAGE}.yaml" else - ARTIFACT_URLS_DOWNLOAD="${FILE_NAME_URLS}_${WAZUH_IMAGE_VERSION}.yaml" + ARTIFACT_URLS_DOWNLOAD="artifact_urls_${WAZUH_IMAGE_VERSION}.yaml" fi else # CASE: Pre-release/Staging (404 Not Found or any other non-200 status) @@ -85,15 +86,15 @@ build() { PACKAGE_URL="packages-staging.xdrsiem.wazuh.info" RELEASE_STAGE="pre-release" if [ -n "$WAZUH_STAGE" ] && [ "$WAZUH_STAGE" != "null" ]; then - ARTIFACT_URLS_DOWNLOAD="${FILE_NAME_URLS}_${WAZUH_IMAGE_VERSION}-${WAZUH_STAGE}.yaml" + ARTIFACT_URLS_DOWNLOAD="artifact_urls_${WAZUH_IMAGE_VERSION}-${WAZUH_STAGE}.yaml" else - ARTIFACT_URLS_DOWNLOAD="${FILE_NAME_URLS}_${WAZUH_IMAGE_VERSION}.yaml" + ARTIFACT_URLS_DOWNLOAD="artifact_urls_${WAZUH_IMAGE_VERSION}.yaml" fi fi # Final download using dynamic variables based on the release type. # Pattern: server / stage / major_version.x / filename - FULL_URL="https://${PACKAGE_URL}/${RELEASE_STAGE}/${WAZUH_MAJOR_VERSION}.x/${FILE_NAME_URLS}/${ARTIFACT_URLS_DOWNLOAD}" + FULL_URL="https://${PACKAGE_URL}/${RELEASE_STAGE}/${WAZUH_MAJOR_VERSION}.x/${ARTIFACT_URLS_DIR}/${ARTIFACT_URLS_DOWNLOAD}" echo "Attempting to download: $FULL_URL" curl -fsSL -o "$ARTIFACT_URLS_FILE" "$FULL_URL" || { echo "Error: Failed to download artifact URLs from $FULL_URL" >&2