From 43c836f4a150db44f33c489e03e25c65fdd891a1 Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Wed, 18 Mar 2026 16:41:55 -0300 Subject: [PATCH 1/8] Fix bumper script --- tools/repository_bumper.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tools/repository_bumper.sh b/tools/repository_bumper.sh index dd643c04..abf70f42 100644 --- a/tools/repository_bumper.sh +++ b/tools/repository_bumper.sh @@ -146,11 +146,6 @@ main() { # Get old version and stage get_old_version_and_stage - if [[ "${OLD_VERSION}" == "${VERSION}" && "${OLD_STAGE}" == "${STAGE}" ]]; then - echo "Version and stage are already up to date." | tee -a "${LOG_FILE}" - echo "No changes needed." | tee -a "${LOG_FILE}" - exit 0 - fi if [[ "${OLD_VERSION}" != "${VERSION}" ]]; then echo "Updating version from ${OLD_VERSION} to ${VERSION}" | tee -a "${LOG_FILE}" update_version_in_files "${VERSION}" From 93bc4a813eb1a79dfb8c41542ef9061e9fa54e49 Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Wed, 18 Mar 2026 17:33:12 -0300 Subject: [PATCH 2/8] Update CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 829e742c..231b55f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ All notable changes to this project will be documented in this file. ### Fixed -- None +- Fix bumper script early exit ([#2261](https://github.com/wazuh/wazuh-docker/pull/2261)) ### Deleted From 0625d0464edc8d05987481dc6009e5c9c383439c Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Thu, 19 Mar 2026 17:23:36 +0700 Subject: [PATCH 3/8] Fix WAZUH_AGENT_GROUP variable --- build-docker-images/wazuh-agent/Dockerfile | 2 +- .../wazuh-agent/config/etc/cont-init.d/0-wazuh-init | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-docker-images/wazuh-agent/Dockerfile b/build-docker-images/wazuh-agent/Dockerfile index 8b5278d2..dd2a9657 100644 --- a/build-docker-images/wazuh-agent/Dockerfile +++ b/build-docker-images/wazuh-agent/Dockerfile @@ -11,7 +11,7 @@ ARG WAZUH_MANAGER_PORT='CHANGE_MANAGER_PORT' ARG WAZUH_REGISTRATION_SERVER='CHANGE_ENROLL_IP' ARG WAZUH_REGISTRATION_PORT='CHANGE_ENROLL_PORT' ARG WAZUH_AGENT_NAME='CHANGE_AGENT_NAME' -ARG WAZUH_AGENT_GROUPS='CHANGE_AGENT_GROUPS' +ARG WAZUH_AGENT_GROUP='CHANGE_AGENT_GROUP' ARG TARGETARCH COPY config/check_repository.sh / diff --git a/build-docker-images/wazuh-agent/config/etc/cont-init.d/0-wazuh-init b/build-docker-images/wazuh-agent/config/etc/cont-init.d/0-wazuh-init index a50b4662..d2fc8d17 100644 --- a/build-docker-images/wazuh-agent/config/etc/cont-init.d/0-wazuh-init +++ b/build-docker-images/wazuh-agent/config/etc/cont-init.d/0-wazuh-init @@ -9,7 +9,7 @@ WAZUH_REGISTRATION_SERVER=${WAZUH_REGISTRATION_SERVER:-$WAZUH_MANAGER_SERVER} WAZUH_REGISTRATION_PORT=${WAZUH_REGISTRATION_PORT:-"1515"} WAZUH_REGISTRATION_PASSWORD=$WAZUH_REGISTRATION_PASSWORD WAZUH_AGENT_NAME=${WAZUH_AGENT_NAME:-"wazuh-agent-$HOSTNAME"} -WAZUH_AGENT_GROUPS=${WAZUH_AGENT_GROUPS:-"default"} +WAZUH_AGENT_GROUP=${WAZUH_AGENT_GROUP:-"default"} ############################################################################## # Aux functions @@ -68,7 +68,7 @@ set_manager_conn() { sed -i "s#CHANGE_ENROLL_IP#$WAZUH_REGISTRATION_SERVER#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf sed -i "s#CHANGE_ENROLL_PORT#$WAZUH_REGISTRATION_PORT#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf sed -i "s#CHANGE_AGENT_NAME#$WAZUH_AGENT_NAME#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf - sed -i "s#CHANGE_AGENT_GROUPS#$WAZUH_AGENT_GROUPS#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf + sed -i "s#CHANGE_AGENT_GROUP#$WAZUH_AGENT_GROUP#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf [ -n "$WAZUH_REGISTRATION_PASSWORD" ] && \ echo "$WAZUH_REGISTRATION_PASSWORD" > ${WAZUH_INSTALL_PATH}/etc/authd.pass && \ chown root:wazuh ${WAZUH_INSTALL_PATH}/etc/authd.pass && \ From ddd2f897175a104a6a773e47742ee10e417d1115 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Thu, 19 Mar 2026 17:26:01 +0700 Subject: [PATCH 4/8] Fix CHANGE_AGENT_GROUP parameter --- docs/ref/configuration/environment-variables.md | 2 +- wazuh-agent/config/wazuh-agent-conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/ref/configuration/environment-variables.md b/docs/ref/configuration/environment-variables.md index eac90d9e..fe889ee8 100644 --- a/docs/ref/configuration/environment-variables.md +++ b/docs/ref/configuration/environment-variables.md @@ -91,7 +91,7 @@ environment: - WAZUH_REGISTRATION_SERVER=wazuh.manager - WAZUH_REGISTRATION_PORT=1515 - WAZUH_AGENT_NAME=my-agent - - WAZUH_AGENT_GROUPS=default + - WAZUH_AGENT_GROUP=default - WAZUH_REGISTRATION_PASSWORD=StrongPassword ``` diff --git a/wazuh-agent/config/wazuh-agent-conf b/wazuh-agent/config/wazuh-agent-conf index ad0d8ece..24cfda7e 100644 --- a/wazuh-agent/config/wazuh-agent-conf +++ b/wazuh-agent/config/wazuh-agent-conf @@ -22,7 +22,7 @@ CHANGE_ENROLL_PORT CHANGE_AGENT_NAME etc/authd.pass - CHANGE_AGENT_GROUPS + CHANGE_AGENT_GROUP From 94f88baab219dff30621e1c7f1031297fbabe5a2 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Thu, 19 Mar 2026 17:42:39 +0700 Subject: [PATCH 5/8] Add changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 829e742c..9b04a2af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ All notable changes to this project will be documented in this file. ### Fixed -- None +- Fix WAZUH_AGENT_GROUP variable ([#2262](https://github.com/wazuh/wazuh-docker/pull/2262)) ### Deleted From 757be8713e51e28aa5aff3bf53a122f3ea54cb38 Mon Sep 17 00:00:00 2001 From: Carlos Bordon Date: Mon, 6 Apr 2026 16:01:13 -0300 Subject: [PATCH 6/8] Updated GitHub actions version for wazuh-docker workflows --- .github/workflows/4_bumper_repository.yml | 2 +- .../Procedure_push_docker_images.yml | 10 +++---- .github/workflows/push.yml | 30 +++++++++---------- .github/workflows/trivy-dashboard.yml | 2 +- .github/workflows/trivy-indexer.yml | 2 +- .github/workflows/trivy-manager.yml | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/4_bumper_repository.yml b/.github/workflows/4_bumper_repository.yml index aed9b1b7..a215726c 100644 --- a/.github/workflows/4_bumper_repository.yml +++ b/.github/workflows/4_bumper_repository.yml @@ -70,7 +70,7 @@ jobs: export GPG_TTY=$(tty) - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: # Using workflow-specific GITHUB_TOKEN because currently CI_WAZUHCI_BUMPER_TOKEN # doesn't have all the necessary permissions diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index 286245b3..7be8995c 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -148,7 +148,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: ref: ${{ inputs.docker_reference }} @@ -156,14 +156,14 @@ jobs: uses: ./.github/free-disk-space - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Configure aws credentials if: ${{ inputs.dev == true }} - uses: aws-actions/configure-aws-credentials@v4 + uses: aws-actions/configure-aws-credentials@v6 with: role-to-assume: ${{ secrets.AWS_IAM_DOCKER_ROLE }} aws-region: "${{ secrets.AWS_REGION }}" @@ -174,7 +174,7 @@ jobs: - name: Log in to Docker Hub if: ${{ inputs.dev == false }} - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 02d83a2c..684a4ec5 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -8,7 +8,7 @@ jobs: steps: - name: Check out code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Build Wazuh images run: ./build-images.sh @@ -26,28 +26,28 @@ jobs: docker save wazuh/wazuh-agent:${{env.WAZUH_IMAGE_VERSION}} -o /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-agent.tar - name: Temporarily save Wazuh manager Docker image - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: docker-artifact-manager path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-manager.tar retention-days: 1 - name: Temporarily save Wazuh indexer Docker image - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: docker-artifact-indexer path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-indexer.tar retention-days: 1 - name: Temporarily save Wazuh dashboard Docker image - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: docker-artifact-dashboard path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-dashboard.tar retention-days: 1 - name: Temporarily save Wazuh agent Docker image - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: docker-artifact-agent path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-agent.tar @@ -70,28 +70,28 @@ jobs: steps: - name: Check out code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Create enviroment variables run: cat .env > $GITHUB_ENV - name: Retrieve saved Wazuh indexer Docker image - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v8 with: name: docker-artifact-indexer - name: Retrieve saved Wazuh manager Docker image - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v8 with: name: docker-artifact-manager - name: Retrieve saved Wazuh dashboard Docker image - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v8 with: name: docker-artifact-dashboard - name: Retrieve saved Wazuh agent Docker image - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v8 with: name: docker-artifact-agent @@ -211,7 +211,7 @@ jobs: steps: - name: Check out code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Create enviroment variables run: cat .env > $GITHUB_ENV @@ -220,22 +220,22 @@ jobs: uses: ./.github/free-disk-space - name: Retrieve saved Wazuh dashboard Docker image - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v8 with: name: docker-artifact-dashboard - name: Retrieve saved Wazuh manager Docker image - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v8 with: name: docker-artifact-manager - name: Retrieve saved Wazuh indexer Docker image - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v8 with: name: docker-artifact-indexer - name: Retrieve saved Wazuh agent Docker image - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v8 with: name: docker-artifact-agent diff --git a/.github/workflows/trivy-dashboard.yml b/.github/workflows/trivy-dashboard.yml index 5239d93c..f4731b21 100644 --- a/.github/workflows/trivy-dashboard.yml +++ b/.github/workflows/trivy-dashboard.yml @@ -29,7 +29,7 @@ jobs: runs-on: "ubuntu-22.04" steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v6 - name: Installing dependencies run: | diff --git a/.github/workflows/trivy-indexer.yml b/.github/workflows/trivy-indexer.yml index 6f69f206..bad0abef 100644 --- a/.github/workflows/trivy-indexer.yml +++ b/.github/workflows/trivy-indexer.yml @@ -29,7 +29,7 @@ jobs: runs-on: "ubuntu-22.04" steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v6 - name: Installing dependencies run: | diff --git a/.github/workflows/trivy-manager.yml b/.github/workflows/trivy-manager.yml index da75bcc7..609f36ac 100644 --- a/.github/workflows/trivy-manager.yml +++ b/.github/workflows/trivy-manager.yml @@ -29,7 +29,7 @@ jobs: runs-on: "ubuntu-22.04" steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v6 - name: Installing dependencies run: | From ef76f33729b1e6dea7b31ed5ae789c325d144a70 Mon Sep 17 00:00:00 2001 From: Carlos Bordon Date: Wed, 8 Apr 2026 08:26:23 -0300 Subject: [PATCH 7/8] Updated changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94618a63..559aa8fe 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 +- Updated GitHub actions version for wazuh-docker workflows. ([#2290](https://github.com/wazuh/wazuh-docker/pull/2290)) ### Fixed From 9d87298016725018aa5e726c67fef5072ec32f09 Mon Sep 17 00:00:00 2001 From: Carlos Bordon Date: Wed, 8 Apr 2026 08:36:28 -0300 Subject: [PATCH 8/8] Fixed merge conflict --- .../wazuh-agent/config/etc/cont-init.d/0-wazuh-init | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build-docker-images/wazuh-agent/config/etc/cont-init.d/0-wazuh-init b/build-docker-images/wazuh-agent/config/etc/cont-init.d/0-wazuh-init index 0f03a614..fa5578a1 100644 --- a/build-docker-images/wazuh-agent/config/etc/cont-init.d/0-wazuh-init +++ b/build-docker-images/wazuh-agent/config/etc/cont-init.d/0-wazuh-init @@ -67,10 +67,6 @@ set_manager_conn() { sed -i "s#CHANGE_ENROLL_IP#$WAZUH_REGISTRATION_SERVER#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf sed -i "s#CHANGE_ENROLL_PORT#$WAZUH_REGISTRATION_PORT#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf sed -i "s#CHANGE_AGENT_NAME#$WAZUH_AGENT_NAME#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf -<<<<<<< HEAD - sed -i "s#CHANGE_AGENT_GROUP#$WAZUH_AGENT_GROUP#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf -======= ->>>>>>> 9de7fdc034e520e756696f964c8fd6c81acb020a [ -n "$WAZUH_REGISTRATION_PASSWORD" ] && \ echo "$WAZUH_REGISTRATION_PASSWORD" > ${WAZUH_INSTALL_PATH}/etc/authd.pass && \ chown root:wazuh ${WAZUH_INSTALL_PATH}/etc/authd.pass && \