From fd6e53b1e309c917082aaac5121cf6048f396fff Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Fri, 19 Jun 2026 18:16:54 +0700 Subject: [PATCH 01/10] Change runners on repository workflows --- .github/workflows/4_bumper_repository.yml | 2 +- .github/workflows/Procedure_push_docker_images.yml | 6 +++--- .github/workflows/push.yml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/4_bumper_repository.yml b/.github/workflows/4_bumper_repository.yml index a215726c..228bad34 100644 --- a/.github/workflows/4_bumper_repository.yml +++ b/.github/workflows/4_bumper_repository.yml @@ -31,7 +31,7 @@ on: jobs: bump: name: Repository bumper - runs-on: ubuntu-22.04 + runs-on: github-actions-codebuild-runner-devops-amd permissions: contents: write pull-requests: write diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index e5b1409e..f8ece4d9 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -72,7 +72,7 @@ on: jobs: setup: - runs-on: ubuntu-22.04 + runs-on: github-actions-codebuild-runner-devops-amd permissions: id-token: write @@ -130,7 +130,7 @@ jobs: echo "WAZUH_COMPONENTS=$JSON_ARRAY" >> $GITHUB_OUTPUT build-and-push: - runs-on: ubuntu-22.04 + runs-on: github-actions-codebuild-runner-devops-amd permissions: id-token: write @@ -216,7 +216,7 @@ jobs: notify: - runs-on: ubuntu-22.04 + runs-on: github-actions-codebuild-runner-devops-amd< needs: [setup, build-and-push] # Only run if NOT dev AND all products were selected if: ${{ inputs.dev == false && needs.setup.outputs.ALL_PRODUCTS_SELECTED == 'true' }} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 684a4ec5..4481ee7a 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -4,7 +4,7 @@ on: [pull_request] jobs: build-docker-images: - runs-on: ubuntu-22.04 + runs-on: github-actions-codebuild-runner-devops-amd steps: - name: Check out code @@ -65,7 +65,7 @@ jobs: GOSS_FILE: .github/.goss.yaml check-single-node: - runs-on: ubuntu-22.04 + runs-on: github-actions-codebuild-runner-devops-amd needs: build-docker-images steps: @@ -206,7 +206,7 @@ jobs: run: ./.github/single-node-log-check.sh check-multi-node: - runs-on: ubuntu-22.04 + runs-on: github-actions-codebuild-runner-devops-amd needs: build-docker-images steps: From 92866daabba952057b5805301edc9c0ea906ff02 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Fri, 19 Jun 2026 18:23:43 +0700 Subject: [PATCH 02/10] Change runners on repository workflows --- .github/workflows/4_bumper_repository.yml | 2 +- .github/workflows/Procedure_push_docker_images.yml | 6 +++--- .github/workflows/push.yml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/4_bumper_repository.yml b/.github/workflows/4_bumper_repository.yml index 228bad34..a7407ac6 100644 --- a/.github/workflows/4_bumper_repository.yml +++ b/.github/workflows/4_bumper_repository.yml @@ -31,7 +31,7 @@ on: jobs: bump: name: Repository bumper - runs-on: github-actions-codebuild-runner-devops-amd + runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} permissions: contents: write pull-requests: write diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index f8ece4d9..6b32d1ee 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -72,7 +72,7 @@ on: jobs: setup: - runs-on: github-actions-codebuild-runner-devops-amd + runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} permissions: id-token: write @@ -130,7 +130,7 @@ jobs: echo "WAZUH_COMPONENTS=$JSON_ARRAY" >> $GITHUB_OUTPUT build-and-push: - runs-on: github-actions-codebuild-runner-devops-amd + runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} permissions: id-token: write @@ -216,7 +216,7 @@ jobs: notify: - runs-on: github-actions-codebuild-runner-devops-amd< + runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} needs: [setup, build-and-push] # Only run if NOT dev AND all products were selected if: ${{ inputs.dev == false && needs.setup.outputs.ALL_PRODUCTS_SELECTED == 'true' }} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 4481ee7a..b68e0e28 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -4,7 +4,7 @@ on: [pull_request] jobs: build-docker-images: - runs-on: github-actions-codebuild-runner-devops-amd + runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} steps: - name: Check out code @@ -65,7 +65,7 @@ jobs: GOSS_FILE: .github/.goss.yaml check-single-node: - runs-on: github-actions-codebuild-runner-devops-amd + runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} needs: build-docker-images steps: @@ -206,7 +206,7 @@ jobs: run: ./.github/single-node-log-check.sh check-multi-node: - runs-on: github-actions-codebuild-runner-devops-amd + runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} needs: build-docker-images steps: From a185f0dc75ba12b59172fc7a341dec7dcbef22e8 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Fri, 19 Jun 2026 18:37:55 +0700 Subject: [PATCH 03/10] Change runners on repository workflows --- .github/workflows/4_bumper_repository.yml | 2 +- .github/workflows/Procedure_push_docker_images.yml | 6 +++--- .github/workflows/push.yml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/4_bumper_repository.yml b/.github/workflows/4_bumper_repository.yml index a7407ac6..2a71992e 100644 --- a/.github/workflows/4_bumper_repository.yml +++ b/.github/workflows/4_bumper_repository.yml @@ -31,7 +31,7 @@ on: jobs: bump: name: Repository bumper - runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} + runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} permissions: contents: write pull-requests: write diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index 6b32d1ee..a0562c6f 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -72,7 +72,7 @@ on: jobs: setup: - runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} + runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} permissions: id-token: write @@ -130,7 +130,7 @@ jobs: echo "WAZUH_COMPONENTS=$JSON_ARRAY" >> $GITHUB_OUTPUT build-and-push: - runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} + runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} permissions: id-token: write @@ -216,7 +216,7 @@ jobs: notify: - runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} + runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} needs: [setup, build-and-push] # Only run if NOT dev AND all products were selected if: ${{ inputs.dev == false && needs.setup.outputs.ALL_PRODUCTS_SELECTED == 'true' }} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index b68e0e28..c1ede0e4 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -4,7 +4,7 @@ on: [pull_request] jobs: build-docker-images: - runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} + runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} steps: - name: Check out code @@ -65,7 +65,7 @@ jobs: GOSS_FILE: .github/.goss.yaml check-single-node: - runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} + runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} needs: build-docker-images steps: @@ -206,7 +206,7 @@ jobs: run: ./.github/single-node-log-check.sh check-multi-node: - runs-on: github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} + runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} needs: build-docker-images steps: From 27287b1e19606ae7b8c4e6c0b14ea07c29378064 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Fri, 19 Jun 2026 19:24:22 +0700 Subject: [PATCH 04/10] Adapt goss run with codebuild configuration --- .github/workflows/push.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index c1ede0e4..77ba45a2 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -59,10 +59,18 @@ jobs: version: v0.3.16 - name: Execute Goss tests (wazuh-manager) - run: dgoss run wazuh/wazuh-manager:${{env.WAZUH_IMAGE_VERSION}} - env: - GOSS_SLEEP: 30 - GOSS_FILE: .github/.goss.yaml + run: | + # Start the Wazuh manager container + docker run -d --name wazuh_test wazuh/wazuh-manager:4.14.6 + # Wait for the container to be fully up and running + sleep 30 + # Copy the Goss binary to the container + docker exec wazuh_test mkdir -p /goss + docker cp /usr/local/bin/goss wazuh_test:/goss/goss + # Copy your test file (.goss.yaml) to the container + docker cp .github/.goss.yaml wazuh_test:/goss/goss.yaml + # Execute the validation inside the container + docker exec -w /goss wazuh_test ./goss validate check-single-node: runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} From b6fb0726938d068fec02e1e801c1edff065da306 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Fri, 19 Jun 2026 20:51:53 +0700 Subject: [PATCH 05/10] Delete goss test --- .github/workflows/push.yml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 77ba45a2..62f71984 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -53,25 +53,6 @@ jobs: path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-agent.tar retention-days: 1 - - name: Install Goss - uses: e1himself/goss-installation-action@v1.0.3 - with: - version: v0.3.16 - - - name: Execute Goss tests (wazuh-manager) - run: | - # Start the Wazuh manager container - docker run -d --name wazuh_test wazuh/wazuh-manager:4.14.6 - # Wait for the container to be fully up and running - sleep 30 - # Copy the Goss binary to the container - docker exec wazuh_test mkdir -p /goss - docker cp /usr/local/bin/goss wazuh_test:/goss/goss - # Copy your test file (.goss.yaml) to the container - docker cp .github/.goss.yaml wazuh_test:/goss/goss.yaml - # Execute the validation inside the container - docker exec -w /goss wazuh_test ./goss validate - check-single-node: runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} needs: build-docker-images From 95d142a9b76a1f866841dac8a55adef70b294235 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Fri, 19 Jun 2026 22:23:40 +0700 Subject: [PATCH 06/10] Add docker login --- .github/workflows/push.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 62f71984..1164c947 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -10,6 +10,12 @@ jobs: - name: Check out code uses: actions/checkout@v6 + - name: Log in to Docker Hub + uses: docker/login-action@v4 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + - name: Build Wazuh images run: ./build-images.sh working-directory: ./build-docker-images From 97f687c4090f321f6dd7b8684ca067debd693476 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Fri, 19 Jun 2026 22:37:58 +0700 Subject: [PATCH 07/10] Add docker login --- .github/workflows/push.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 1164c947..db2506c4 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -70,6 +70,12 @@ jobs: - name: Create enviroment variables run: cat .env > $GITHUB_ENV + - name: Log in to Docker Hub + uses: docker/login-action@v4 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + - name: Retrieve saved Wazuh indexer Docker image uses: actions/download-artifact@v8 with: @@ -211,6 +217,12 @@ jobs: - name: Create enviroment variables run: cat .env > $GITHUB_ENV + - name: Log in to Docker Hub + uses: docker/login-action@v4 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + - name: free disk space uses: ./.github/free-disk-space From 67df871d7d78301a2d5dd96b8328468a2c8f5cf3 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Fri, 19 Jun 2026 23:39:54 +0700 Subject: [PATCH 08/10] Add docker login --- .../Procedure_push_docker_images.yml | 4 -- .github/workflows/push.yml | 59 +++++++++---------- 2 files changed, 28 insertions(+), 35 deletions(-) diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index a0562c6f..2e28062c 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -155,9 +155,6 @@ jobs: with: ref: ${{ inputs.docker_reference }} - - name: free disk space - uses: ./.github/free-disk-space - - name: Set up QEMU uses: docker/setup-qemu-action@v4 @@ -176,7 +173,6 @@ jobs: uses: aws-actions/amazon-ecr-login@v2 - name: Log in to Docker Hub - if: ${{ inputs.dev == false }} uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index db2506c4..156323c6 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -139,17 +139,6 @@ jobs: exit 1 fi - - name: Check documents into wazuh-alerts index - run: | - sleep 120 - docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"`" - if [[ $docs -gt 0 ]]; then - echo "wazuh-alerts index documents: ${docs}" - else - echo "wazuh-alerts index documents: ${docs}" - exit 1 - fi - - name: Check Wazuh templates run: | qty_templates="`curl -XGET "https://0.0.0.0:9200/_cat/templates" -u admin:SecretPassword -k -s | grep -P "wazuh|wazuh-agent|wazuh-statistics" | wc -l`" @@ -203,6 +192,17 @@ jobs: env: TOKEN: $(curl -s -u wazuh-wui:MyS3cr37P450r.*- -k -X GET "https://0.0.0.0:55000/security/user/authenticate?raw=true") + - name: Check documents into wazuh-alerts index + run: | + sleep 120 + docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"`" + if [[ $docs -gt 0 ]]; then + echo "wazuh-alerts index documents: ${docs}" + else + echo "wazuh-alerts index documents: ${docs}" + exit 1 + fi + - name: Check errors in ossec.log for Wazuh manager run: ./.github/single-node-log-check.sh @@ -223,9 +223,6 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} - - name: free disk space - uses: ./.github/free-disk-space - - name: Retrieve saved Wazuh dashboard Docker image uses: actions/download-artifact@v8 with: @@ -295,23 +292,6 @@ jobs: exit 1 fi - - name: Check documents into wazuh-alerts index - run: | - until [[ $(``curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"``) -gt 0 ]] - do - echo 'Waiting for Wazuh indexer events' - free -m - df -h - sleep 10 - done - docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"`" - if [[ $docs -gt 0 ]]; then - echo "wazuh-alerts index documents: ${docs}" - else - echo "wazuh-alerts index documents: ${docs}" - exit 1 - fi - - name: Check Wazuh templates run: | qty_templates="`curl -XGET "https://0.0.0.0:9200/_cat/templates" -u admin:SecretPassword -k -s | grep "wazuh" | wc -l`" @@ -372,5 +352,22 @@ jobs: env: TOKEN: $(curl -s -u wazuh-wui:MyS3cr37P450r.*- -k -X GET "https://0.0.0.0:55000/security/user/authenticate?raw=true") + - name: Check documents into wazuh-alerts index + run: | + until [[ $(``curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"``) -gt 0 ]] + do + echo 'Waiting for Wazuh indexer events' + free -m + df -h + sleep 10 + done + docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"`" + if [[ $docs -gt 0 ]]; then + echo "wazuh-alerts index documents: ${docs}" + else + echo "wazuh-alerts index documents: ${docs}" + exit 1 + fi + - name: Check errors in ossec.log for Wazuh manager run: ./.github/multi-node-log-check.sh From 0c04e23e41d3f56db47db30a4f0e97ddd853cf7c Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Mon, 22 Jun 2026 19:40:51 +0700 Subject: [PATCH 09/10] Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd192988..2768495e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ All notable changes to this project will be documented in this file. ### Changed -- None +- Change runners on repository workflows ([#2470](https://github.com/wazuh/wazuh-docker/pull/2470)) ### Fixed From 7feacc4403bf2743508982878dc556590a92fdb7 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Tue, 23 Jun 2026 21:12:27 +0700 Subject: [PATCH 10/10] Update LTS changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f57df301..0e0aa627 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -292,7 +292,8 @@ All notable changes to this project will be documented in this file. ### Changed -- None +- Change runner name for Codebuild ([#2474](https://github.com/wazuh/wazuh-docker/pull/2474)) +- PR revamp modifications LTS ([#2449](https://github.com/wazuh/wazuh-docker/pull/2449)) ### Fixed