Merge pull request #2380 from wazuh/test/5538-source

Merge test/5538-source into test/5538-target [automated]

.github/.goss.yaml

@@ -2,14 +2,14 @@ file:
   /var/wazuh-manager/bin/wazuh-manager-control:
     exists: true
     mode: "0750"
-    owner: wazuh-manager
-    group: wazuh-manager
+    owner: root
+    group: root
     filetype: file
     contains: []
   /var/wazuh-manager/etc/wazuh-manager.conf:
     exists: true
     mode: "0660"
-    owner: wazuh-manager
+    owner: root
     group: wazuh-manager
     filetype: file
     contains: []

.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 }}-latest
+      run: dgoss run ${{ env.WAZUH_REGISTRY }}/wazuh/wazuh-manager:${{ env.WAZUH_IMAGE_VERSION }}
       env:
         GOSS_SLEEP: 30
         GOSS_FILE: .github/.goss.yaml
@@ -162,7 +162,6 @@ 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
@@ -285,7 +284,6 @@ 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
@@ -443,7 +441,6 @@ 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
@@ -576,7 +573,6 @@ 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

.test-5538

@@ -0,0 +1 @@
+test merge for test/5538 - 20260505T224644Z

CHANGELOG.md

@@ -11,8 +11,6 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
-- Change file owners on Goss test ([#2395](https://github.com/wazuh/wazuh-docker/pull/2395))
-- 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))

build-docker-images/wazuh-indexer/Dockerfile

@@ -32,8 +32,7 @@ FROM amazonlinux:2023
 ENV USER="wazuh-indexer" \
     GROUP="wazuh-indexer" \
     NAME="wazuh-indexer" \
-    INSTALL_DIR="/usr/share/wazuh-indexer" 
-ENV ENGINE_DIR="$INSTALL_DIR/engine"
+    INSTALL_DIR="/usr/share/wazuh-indexer"
 
 
 COPY config/entrypoint.sh /
@@ -64,14 +63,7 @@ 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 && \
-    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
+    chmod 600 $INSTALL_DIR/config/opensearch.yml
 
 USER wazuh-indexer
 WORKDIR $INSTALL_DIR

build-docker-images/wazuh-indexer/config/entrypoint.sh

@@ -58,12 +58,6 @@ 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[@]}"