Reverted back the push.yaml and build-image.sh script changes, made changes in dockerfile and initscript

Author: arun hundaragi

build-docker-images/wazuh-manager/Dockerfile

@@ -3,8 +3,8 @@ FROM ubuntu:focal
 
 RUN rm /bin/sh && ln -s /bin/bash /bin/sh
 
-ARG WAZUH_VERSION
-ARG WAZUH_TAG_REVISION
+ARG WAZUH_VERSION=4.7.2
+ARG WAZUH_TAG_REVISION=1
 ARG FILEBEAT_TEMPLATE_BRANCH
 ARG FILEBEAT_CHANNEL=filebeat-oss
 ARG FILEBEAT_VERSION=7.10.2
@@ -13,11 +13,13 @@ ARG WAZUH_FILEBEAT_MODULE
 RUN apt-get update && apt install curl apt-transport-https lsb-release gnupg -y
 
 COPY config/check_repository.sh /
-RUN chmod 775 /check_repository.sh
-RUN source /check_repository.sh
+RUN chmod 775 /check_repository.sh && \
+    . /check_repository.sh && \
+    echo "WAZUH_VERSION: $WAZUH_VERSION" && \
+    echo "WAZUH_TAG_REVISION: $WAZUH_TAG_REVISION"
 
 RUN apt-get update && \
-    apt-get install wazuh-manager=${WAZUH_VERSION}-${WAZUH_TAG_REVISION}
+    apt-get install -y wazuh-manager=${WAZUH_VERSION}-${WAZUH_TAG_REVISION}
 
 COPY config/filebeat_module.sh /
 RUN chmod 775 /filebeat_module.sh

build-docker-images/wazuh-manager/config/check_repository.sh

@@ -25,5 +25,5 @@ elif [ "$MAJOR_BUILD" -eq "$MAJOR_CURRENT" ]; then
   fi
 fi
 
-apt-key adv --fetch-keys ${APT_KEY}
+curl -fsSL ${APT_KEY} | gpg --dearmor | tee /etc/apt/trusted.gpg.d/wazuh.gpg > /dev/null
 echo ${REPOSITORY} | tee -a /etc/apt/sources.list.d/wazuh.list

build-docker-images/wazuh-manager/config/filebeat_module.sh

@@ -1,13 +1,20 @@
+#!/bin/bash
+
+# Define the default repository
 REPOSITORY="packages.wazuh.com/4.x"
+
+# Fetch the latest Wazuh version from GitHub
 WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2-)
-MAJOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f1)
-MID_BUILD=$(echo $WAZUH_VERSION | cut -d. -f2)
-MINOR_BUILD=$(echo $WAZUH_VERSION | cut -d. -f3)
-MAJOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f1)
-MID_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f2)
-MINOR_CURRENT=$(echo $WAZUH_CURRENT_VERSION | cut -d. -f3)
-
-## check version to use the correct repository
+
+# Extract version components
+MAJOR_BUILD=$(echo "$WAZUH_VERSION" | cut -d. -f1)
+MID_BUILD=$(echo "$WAZUH_VERSION" | cut -d. -f2)
+MINOR_BUILD=$(echo "$WAZUH_VERSION" | cut -d. -f3)
+MAJOR_CURRENT=$(echo "$WAZUH_CURRENT_VERSION" | cut -d. -f1)
+MID_CURRENT=$(echo "$WAZUH_CURRENT_VERSION" | cut -d. -f2)
+MINOR_CURRENT=$(echo "$WAZUH_CURRENT_VERSION" | cut -d. -f3)
+
+# Select repository based on version comparison
 if [ "$MAJOR_BUILD" -gt "$MAJOR_CURRENT" ]; then
   REPOSITORY="packages-dev.wazuh.com/pre-release"
 elif [ "$MAJOR_BUILD" -eq "$MAJOR_CURRENT" ]; then
@@ -20,8 +27,25 @@ elif [ "$MAJOR_BUILD" -eq "$MAJOR_CURRENT" ]; then
   fi
 fi
 
-curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-amd64.deb &&\
-dpkg -i ${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-amd64.deb && rm -f ${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-amd64.deb && \
+# Detect system architecture (amd64 or arm64)
+ARCH=$(dpkg --print-architecture)
+if [ "$ARCH" == "arm64" ]; then
+  FILEBEAT_ARCH="arm64"
+else
+  FILEBEAT_ARCH="amd64"
+fi
+
+# Download and install the correct Filebeat package
+curl -L -O "https://artifacts.elastic.co/downloads/beats/filebeat/${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-${FILEBEAT_ARCH}.deb"
+dpkg -i "${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-${FILEBEAT_ARCH}.deb"
+rm -f "${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-${FILEBEAT_ARCH}.deb"
+
+# Ensure the Filebeat module directory exists before extraction
+mkdir -p /usr/share/filebeat/module
+
+# Extract Filebeat modules
 curl -s https://duplo-wazuh.s3.us-west-2.amazonaws.com/duplo-wazuh-filebeat.tar.gz | tar -xvz -C /usr/share/filebeat/module
+
+# Set correct ownership and permissions
 chown -R root:root /usr/share/filebeat/module
-chmod -R go-w /usr/share/filebeat/module/
+chmod -R go-w /usr/share/filebeat/module