From 56636c0dd72e2561c02b9c23ac382d2a879c1344 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Tue, 3 Feb 2026 02:35:52 +0700 Subject: [PATCH 1/6] Add Wazuh version and revision into wazuh-certs-tool and config file --- .github/workflows/5_pr_check.yml | 6 +++--- .github/workflows/Procedure_push_docker_images.yml | 3 ++- .gitignore | 8 ++++---- docs/ref/getting-started/deployment/multi-node.md | 4 ++-- docs/ref/getting-started/deployment/single-node.md | 4 ++-- docs/ref/getting-started/requirements.md | 2 +- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/5_pr_check.yml b/.github/workflows/5_pr_check.yml index f54a8164..1a5c0860 100644 --- a/.github/workflows/5_pr_check.yml +++ b/.github/workflows/5_pr_check.yml @@ -40,7 +40,7 @@ jobs: image_tag: ${{ needs.prepare-variables.outputs.WAZUH_IMAGE_VERSION }} docker_reference: ${{ github.head_ref }} revision: ${{ needs.prepare-variables.outputs.WAZUH_TAG_REVISION }} - reference: "latest" + commit_list: '["latest", "latest", "latest", "latest"]' id: ${{ github.run_id }} dev: true @@ -111,7 +111,7 @@ jobs: - name: Create single node certficates run: | - wazuh_certs_tool_url=$(aws s3 presign s3://${{ vars.AWS_S3_BUCKET_DEV }}/development/wazuh/5.x/secondary/installation-assistant/${{ env.WAZUH_IMAGE_VERSION }}/wazuh-certs-tool.sh --expires-in 3600 --region us-west-1) + wazuh_certs_tool_url=$(aws s3 presign s3://${{ vars.AWS_S3_BUCKET_DEV }}/development/wazuh/5.x/secondary/installation-assistant/${{ env.WAZUH_IMAGE_VERSION }}/wazuh-certs-tool-${{ env.WAZUH_IMAGE_VERSION }}-latest.sh --expires-in 3600 --region us-west-1) curl -sL "$wazuh_certs_tool_url" -o ./wazuh-certs-tool.sh cat > config.yml < config.yml <> "$OUTPUT_FILE" diff --git a/.gitignore b/.gitignore index 302fbb6d..79dfd348 100644 --- a/.gitignore +++ b/.gitignore @@ -4,10 +4,10 @@ build-docker-images/artifacts_env.txt single-node/wazuh-certificates single-node/wazuh-certificates/* single-node/wazuh-certificates-tool.log -single-node/wazuh-certs-tool.sh -single-node/config.yml +single-node/wazuh-certs-tool*.sh +single-node/config*.yml multi-node/wazuh-certificates multi-node/wazuh-certificates/* multi-node/wazuh-certificates-tool.log -multi-node/wazuh-certs-tool.sh -multi-node/config.yml +multi-node/wazuh-certs-tool*.sh +multi-node/config*.yml diff --git a/docs/ref/getting-started/deployment/multi-node.md b/docs/ref/getting-started/deployment/multi-node.md index 6ee10934..066627c7 100644 --- a/docs/ref/getting-started/deployment/multi-node.md +++ b/docs/ref/getting-started/deployment/multi-node.md @@ -21,8 +21,8 @@ This deployment utilizes the `multi-node/docker-compose.yml` file, which defines 3. Download the certificate creation script and config.yml file: ```bash - curl -sO https://packages.wazuh.com/5.0/wazuh-certs-tool.sh - curl -sO https://packages.wazuh.com/5.0/config.yml + curl -o wazuh-certs-tool.sh https://packages.wazuh.com/5.0/wazuh-certs-tool-5.0.0-1.sh + curl -o config.yml https://packages.wazuh.com/5.0/config-5.0.0-1.yml ``` 4. Edit the `config.yml` file with the configuration of the Wazuh components to be deployed diff --git a/docs/ref/getting-started/deployment/single-node.md b/docs/ref/getting-started/deployment/single-node.md index f058fe3b..42c9fcef 100644 --- a/docs/ref/getting-started/deployment/single-node.md +++ b/docs/ref/getting-started/deployment/single-node.md @@ -21,8 +21,8 @@ This deployment uses the `single-node/docker-compose.yml` file, which defines a 3. Download the certificate creation script and `config.yml` file: ```bash - curl -sO https://packages.wazuh.com/5.0/wazuh-certs-tool.sh - curl -sO https://packages.wazuh.com/5.0/config.yml + curl -o wazuh-certs-tool.sh https://packages.wazuh.com/5.0/wazuh-certs-tool-5.0.0-1.sh + curl -o config.yml https://packages.wazuh.com/5.0/config-5.0.0-1.yml ``` 4. Edit the config.yml file with the configuration of the Wazuh components to be deployed diff --git a/docs/ref/getting-started/requirements.md b/docs/ref/getting-started/requirements.md index 48cb1c40..937c285e 100644 --- a/docs/ref/getting-started/requirements.md +++ b/docs/ref/getting-started/requirements.md @@ -53,7 +53,7 @@ These are general recommendations. Actual needs may vary based on the number of * **Docker Desktop** * Install Docker Desktop by following the official instructions: [Install Docker Desktop](https://docs.docker.com/desktop/setup/install/windows-install/). * **WSL Linux distribution** - * Install Ubuntu or other compatible Linux distribution (bash in Alpine is not comptible with wazuh-certs-tool.sh): [Install Ubuntu on WSL](https://documentation.ubuntu.com/wsl/stable/howto/install-ubuntu-wsl2/) + * Install Ubuntu or other compatible Linux distribution (bash in Alpine is not compatible with wazuh-certs-tool-5.0.0-1.sh): [Install Ubuntu on WSL](https://documentation.ubuntu.com/wsl/stable/howto/install-ubuntu-wsl2/) * **Git Client**: * Required for cloning the `wazuh-docker` repository. * **Web Browser**: From 4f8ee2caea2c197700060a30c8ee39448cefc6d7 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Tue, 3 Feb 2026 19:01:18 +0700 Subject: [PATCH 2/6] Change artifacts URLs file name --- .github/workflows/Procedure_push_docker_images.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index 6bbaa43d..b5873666 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -134,7 +134,7 @@ jobs: needs: setup env: - ARTIFACT_URLS_FILE_TEMP: "/tmp/wazuh-docker/artifact_urls_test.yml" + ARTIFACT_URLS_FILE_TEMP: "/tmp/wazuh-docker/artifact_urls.yml" steps: - name: Configure AWS credentials @@ -151,7 +151,7 @@ jobs: # Download the S3 package URIs file S3_BUCKET="${{ secrets.ARTIFACTS_S3_BUCKET }}" - S3_KEY="deployment/artifact_urls.yml" + S3_KEY="deployment/artifact_urls_test.yml" aws s3 cp "s3://$S3_BUCKET/$S3_KEY" "$ARTIFACT_URLS_FILE_TEMP" --region us-west-1 # Verify the file was downloaded From c0f8f52acdf68dfb83cfb4b23d1931113d2dbe96 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Tue, 3 Feb 2026 21:29:19 +0700 Subject: [PATCH 3/6] Change artifact download method --- .github/workflows/5_pr_check.yml | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/.github/workflows/5_pr_check.yml b/.github/workflows/5_pr_check.yml index 1a5c0860..78929af0 100644 --- a/.github/workflows/5_pr_check.yml +++ b/.github/workflows/5_pr_check.yml @@ -109,10 +109,21 @@ jobs: - name: Log in to Amazon ECR uses: aws-actions/amazon-ecr-login@v2 + - name: Download artifact_urls.yml + uses: actions/download-artifact@v4 + with: + name: presigned-artifact-urls-${{ github.run_id }} + path: ./single-node/ + + - name: Add environment variables into GITHUB_ENV + run: | + # Export variables to the environment + awk -F':' '!/^#/ && NF>1 {name=$1; val=substr($0,length(name)+3); gsub(/[-.]/,"_",name); print name "=" val}' artifact_urls.yml >> "$GITHUB_ENV" + working-directory: ./single-node/ + - name: Create single node certficates run: | - wazuh_certs_tool_url=$(aws s3 presign s3://${{ vars.AWS_S3_BUCKET_DEV }}/development/wazuh/5.x/secondary/installation-assistant/${{ env.WAZUH_IMAGE_VERSION }}/wazuh-certs-tool-${{ env.WAZUH_IMAGE_VERSION }}-latest.sh --expires-in 3600 --region us-west-1) - curl -sL "$wazuh_certs_tool_url" -o ./wazuh-certs-tool.sh + curl -sL "$wazuh_certs_tool" -o ./wazuh-certs-tool.sh cat > config.yml <1 {name=$1; val=substr($0,length(name)+3); gsub(/[-.]/,"_",name); print name "=" val}' artifact_urls.yml >> "$GITHUB_ENV" + working-directory: ./multi-node/ + - name: Create multi node certficates run: | - wazuh_certs_tool_url=$(aws s3 presign s3://${{ vars.AWS_S3_BUCKET_DEV }}/development/wazuh/5.x/secondary/installation-assistant/${{ env.WAZUH_IMAGE_VERSION }}/wazuh-certs-tool-${{ env.WAZUH_IMAGE_VERSION }}-latest.sh --expires-in 3600 --region us-west-1) - curl -sL "$wazuh_certs_tool_url" -o ./wazuh-certs-tool.sh + curl -sL "$wazuh_certs_tool" -o ./wazuh-certs-tool.sh cat > config.yml < Date: Wed, 4 Feb 2026 01:56:29 +0700 Subject: [PATCH 4/6] Change the wazuh-certs-tool URL get method --- .github/workflows/5_pr_check.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/5_pr_check.yml b/.github/workflows/5_pr_check.yml index 78929af0..8fa39f8f 100644 --- a/.github/workflows/5_pr_check.yml +++ b/.github/workflows/5_pr_check.yml @@ -123,7 +123,7 @@ jobs: - name: Create single node certficates run: | - curl -sL "$wazuh_certs_tool" -o ./wazuh-certs-tool.sh + curl -o ./wazuh-certs-tool.sh ${{ env.wazuh_certs_tool }} cat > config.yml < config.yml < Date: Wed, 4 Feb 2026 02:33:17 +0700 Subject: [PATCH 5/6] Add changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4703c2dc..8eedef26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file. ### Changed +- Add Wazuh version and revision into wazuh-certs-tool and config file ([#2195](https://github.com/wazuh/wazuh-docker/pull/2195)) - Improve S3 artifact URLs handling ([#2183](https://github.com/wazuh/wazuh-docker/pull/2183)) - Allow building separate targets ([#2177](https://github.com/wazuh/wazuh-docker/pull/2177)) - Add developement option when tag name is only version without stage ([#2179](https://github.com/wazuh/wazuh-docker/pull/2179)) From 73214a2e240b0bd7332e6736b8a635547f2da817 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Wed, 4 Feb 2026 19:21:07 +0700 Subject: [PATCH 6/6] Revert artifact URL file name --- .github/workflows/Procedure_push_docker_images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index b5873666..864e4ffe 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -151,7 +151,7 @@ jobs: # Download the S3 package URIs file S3_BUCKET="${{ secrets.ARTIFACTS_S3_BUCKET }}" - S3_KEY="deployment/artifact_urls_test.yml" + S3_KEY="deployment/artifact_urls.yml" aws s3 cp "s3://$S3_BUCKET/$S3_KEY" "$ARTIFACT_URLS_FILE_TEMP" --region us-west-1 # Verify the file was downloaded