From 77c8526c1c4d4db81029d6fb327a8fa5e849e4f4 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Mon, 11 May 2026 21:44:42 +0700 Subject: [PATCH 1/7] Add Wazuh indexer engine start on entrypoint --- build-docker-images/wazuh-indexer/config/entrypoint.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build-docker-images/wazuh-indexer/config/entrypoint.sh b/build-docker-images/wazuh-indexer/config/entrypoint.sh index 06bb7fc7..5fac7974 100644 --- a/build-docker-images/wazuh-indexer/config/entrypoint.sh +++ b/build-docker-images/wazuh-indexer/config/entrypoint.sh @@ -58,6 +58,12 @@ function runOpensearch { fi done < <(env) + # Start Wazuh Engine + if [ -x "$OPENSEARCH_HOME/engine/run_engine.sh" ]; then + nohup "$OPENSEARCH_HOME/engine/run_engine.sh" > /dev/null 2>&1 & + echo $! > /run/wazuh-indexer/wazuh-engine.pid + fi + # Start opensearch exec "$@" "${opensearch_opts[@]}" From 28a9485f2c46c12ac1d72c18c62e03db03860a36 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Mon, 11 May 2026 22:36:27 +0700 Subject: [PATCH 2/7] Change image version for test deployment --- .github/workflows/5_pr_check.yml | 3 ++- single-node/docker-compose.yml | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/5_pr_check.yml b/.github/workflows/5_pr_check.yml index 4e51ca06..46641ef6 100644 --- a/.github/workflows/5_pr_check.yml +++ b/.github/workflows/5_pr_check.yml @@ -76,7 +76,7 @@ jobs: uses: aws-actions/amazon-ecr-login@v2 - name: Execute Goss tests (wazuh-manager) - run: dgoss run ${{ env.WAZUH_REGISTRY }}/wazuh/wazuh-manager:${{ env.WAZUH_IMAGE_VERSION }} + run: dgoss run ${{ env.WAZUH_REGISTRY }}/wazuh/wazuh-manager:${{ env.WAZUH_IMAGE_VERSION }}-latest env: GOSS_SLEEP: 30 GOSS_FILE: .github/.goss.yaml @@ -162,6 +162,7 @@ jobs: if [ -f "$TARGET_FILE" ]; then echo "Updating registry in $TARGET_FILE to: ${{ env.WAZUH_REGISTRY }}" sed -i "s|wazuh/wazuh-|${{ env.WAZUH_REGISTRY }}/wazuh/wazuh-|g" "$TARGET_FILE" + sed -i "s/\(.*wazuh\/wazuh-.*:\)${{ env.WAZUH_VERSION }}/\1${{ env.WAZUH_IMAGE_VERSION }}-latest/g" "$TARGET_FILE" else echo "File $TARGET_FILE not found" exit 1 diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 8365ed62..2141813e 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -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-latest 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-latest 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-latest hostname: wazuh.dashboard container_name: single-node-wazuh.dashboard restart: always From ccf61969ffadc006795711cfb47145356b1702d5 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Mon, 11 May 2026 23:06:25 +0700 Subject: [PATCH 3/7] Change image version for test deployment --- .github/workflows/5_pr_check.yml | 1 + single-node/docker-compose.yml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/5_pr_check.yml b/.github/workflows/5_pr_check.yml index 46641ef6..93a660a7 100644 --- a/.github/workflows/5_pr_check.yml +++ b/.github/workflows/5_pr_check.yml @@ -442,6 +442,7 @@ jobs: if [ -f "$TARGET_FILE" ]; then echo "Updating registry in $TARGET_FILE to: ${{ env.WAZUH_REGISTRY }}" sed -i "s|wazuh/wazuh-|${{ env.WAZUH_REGISTRY }}/wazuh/wazuh-|g" "$TARGET_FILE" + sed -i "s/\(.*wazuh\/wazuh-.*:\)${{ env.WAZUH_VERSION }}/\1${{ env.WAZUH_IMAGE_VERSION }}-latest/g" "$TARGET_FILE" else echo "File $TARGET_FILE not found" exit 1 diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 2141813e..8365ed62 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -1,7 +1,7 @@ # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2) services: wazuh.manager: - image: wazuh/wazuh-manager:5.0.0-beta1-latest + image: wazuh/wazuh-manager:5.0.0 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-beta1-latest + image: wazuh/wazuh-indexer:5.0.0 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-beta1-latest + image: wazuh/wazuh-dashboard:5.0.0 hostname: wazuh.dashboard container_name: single-node-wazuh.dashboard restart: always From fab6c9ce6e9e5c02f81bde6403113e180367ed89 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Mon, 11 May 2026 23:43:22 +0700 Subject: [PATCH 4/7] Change image version for test deployment --- .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 93a660a7..abb9131b 100644 --- a/.github/workflows/5_pr_check.yml +++ b/.github/workflows/5_pr_check.yml @@ -162,7 +162,7 @@ jobs: if [ -f "$TARGET_FILE" ]; then echo "Updating registry in $TARGET_FILE to: ${{ env.WAZUH_REGISTRY }}" sed -i "s|wazuh/wazuh-|${{ env.WAZUH_REGISTRY }}/wazuh/wazuh-|g" "$TARGET_FILE" - sed -i "s/\(.*wazuh\/wazuh-.*:\)${{ env.WAZUH_VERSION }}/\1${{ env.WAZUH_IMAGE_VERSION }}-latest/g" "$TARGET_FILE" + sed -i "s/\(.*wazuh\/wazuh-.*:\)${{ env.WAZUH_IMAGE_VERSION }}/\1${{ env.WAZUH_IMAGE_VERSION }}-latest/g" "$TARGET_FILE" else echo "File $TARGET_FILE not found" exit 1 @@ -442,7 +442,7 @@ jobs: if [ -f "$TARGET_FILE" ]; then echo "Updating registry in $TARGET_FILE to: ${{ env.WAZUH_REGISTRY }}" sed -i "s|wazuh/wazuh-|${{ env.WAZUH_REGISTRY }}/wazuh/wazuh-|g" "$TARGET_FILE" - sed -i "s/\(.*wazuh\/wazuh-.*:\)${{ env.WAZUH_VERSION }}/\1${{ env.WAZUH_IMAGE_VERSION }}-latest/g" "$TARGET_FILE" + sed -i "s/\(.*wazuh\/wazuh-.*:\)${{ env.WAZUH_IMAGE_VERSION }}/\1${{ env.WAZUH_IMAGE_VERSION }}-latest/g" "$TARGET_FILE" else echo "File $TARGET_FILE not found" exit 1 From 3b4cc5973c864b436646621d8b0356cb4de4f50f Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Tue, 12 May 2026 00:04:45 +0700 Subject: [PATCH 5/7] Change image version for test deployment --- .github/workflows/5_pr_check.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/5_pr_check.yml b/.github/workflows/5_pr_check.yml index abb9131b..797aecbc 100644 --- a/.github/workflows/5_pr_check.yml +++ b/.github/workflows/5_pr_check.yml @@ -285,6 +285,7 @@ jobs: if [ -f "$TARGET_FILE" ]; then echo "Updating registry in $TARGET_FILE to: ${{ env.WAZUH_REGISTRY }}" sed -i "s|wazuh/wazuh-|${{ env.WAZUH_REGISTRY }}/wazuh/wazuh-|g" "$TARGET_FILE" + sed -i "s/\(.*wazuh\/wazuh-.*:\)${{ env.WAZUH_IMAGE_VERSION }}/\1${{ env.WAZUH_IMAGE_VERSION }}-latest/g" "$TARGET_FILE" else echo "File $TARGET_FILE not found" exit 1 @@ -575,6 +576,7 @@ jobs: if [ -f "$TARGET_FILE" ]; then echo "Updating registry in $TARGET_FILE to: ${{ env.WAZUH_REGISTRY }}" sed -i "s|wazuh/wazuh-|${{ env.WAZUH_REGISTRY }}/wazuh/wazuh-|g" "$TARGET_FILE" + sed -i "s/\(.*wazuh\/wazuh-.*:\)${{ env.WAZUH_IMAGE_VERSION }}/\1${{ env.WAZUH_IMAGE_VERSION }}-latest/g" "$TARGET_FILE" else echo "File $TARGET_FILE not found" exit 1 From 7927df1d3428dced26af7d9238deab72386f525e Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Tue, 12 May 2026 01:29:55 +0700 Subject: [PATCH 6/7] Change image version for test deployment --- build-docker-images/wazuh-indexer/Dockerfile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/build-docker-images/wazuh-indexer/Dockerfile b/build-docker-images/wazuh-indexer/Dockerfile index 24630f38..a12262b6 100644 --- a/build-docker-images/wazuh-indexer/Dockerfile +++ b/build-docker-images/wazuh-indexer/Dockerfile @@ -32,7 +32,8 @@ FROM amazonlinux:2023 ENV USER="wazuh-indexer" \ GROUP="wazuh-indexer" \ NAME="wazuh-indexer" \ - INSTALL_DIR="/usr/share/wazuh-indexer" + INSTALL_DIR="/usr/share/wazuh-indexer" +ENV ENGINE_DIR="$INSTALL_DIR/engine" COPY config/entrypoint.sh / @@ -63,7 +64,14 @@ COPY --from=builder --chown=1000:1000 $INSTALL_DIR $INSTALL_DIR RUN chmod 700 $INSTALL_DIR && \ chmod 700 $INSTALL_DIR/config && \ chmod 600 $INSTALL_DIR/config/jvm.options && \ - chmod 600 $INSTALL_DIR/config/opensearch.yml + chmod 600 $INSTALL_DIR/config/opensearch.yml && \ + if [ -d "$ENGINE_DIR" ]; then \ + find "$ENGINE_DIR" -type d -exec chmod 750 {} + && \ + find "$ENGINE_DIR" -type f -exec chmod 640 {} + && \ + { [ -f "$ENGINE_DIR/run_engine.sh" ] && chmod 750 "$ENGINE_DIR/run_engine.sh" || true; } && \ + { [ -f "$ENGINE_DIR/bin/wazuh-engine" ] && chmod 750 "$ENGINE_DIR/bin/wazuh-engine" || true; } && \ + { [ -d "$ENGINE_DIR/sockets" ] && chmod 777 "$ENGINE_DIR/sockets" || true; }; \ + fi USER wazuh-indexer WORKDIR $INSTALL_DIR From 92c091d977f3026a9392f3866833692223d51181 Mon Sep 17 00:00:00 2001 From: Victor Carlos Erenu Date: Tue, 12 May 2026 02:40:07 +0700 Subject: [PATCH 7/7] Add changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa5b0753..3f9ad51c 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 Wazuh indexer engine start on entrypoint ([#2390](https://github.com/wazuh/wazuh-docker/pull/2390)) - Image build process update ([#2358](https://github.com/wazuh/wazuh-docker/pull/2358)) - Add new path on artifact_urls file ([#2344](https://github.com/wazuh/wazuh-docker/pull/2344)) - Presigned URLs generation enhancement ([#2346](https://github.com/wazuh/wazuh-docker/pull/2346))