From 55cd4be54de1d87c9ba1e232d5446363436fea6d Mon Sep 17 00:00:00 2001
From: Carlos Bordon <carlos.e.bordon@gmail.com>
Date: Fri, 5 Dec 2025 13:28:31 -0300
Subject: [PATCH] Copy wazuh dashboard configuration dir

---
 .../wazuh-dashboard/Dockerfile                |  2 ++
 .../config/wazuh_app_config.sh                | 25 +++++--------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile
index eca8fb67..49710226 100644
--- a/build-docker-images/wazuh-dashboard/Dockerfile
+++ b/build-docker-images/wazuh-dashboard/Dockerfile
@@ -5,6 +5,7 @@ ARG WAZUH_VERSION
 ARG WAZUH_TAG_REVISION
 ARG WAZUH_UI_REVISION
 ARG INSTALL_DIR=/usr/share/wazuh-dashboard
+ARG CONFIG_DIR=/etc/wazuh-dashboard
 ARG TARGETARCH
 ARG wazuh_dashboard_url_amd64_rpm
 ARG wazuh_dashboard_url_arm64_rpm
@@ -79,6 +80,7 @@ RUN yum install shadow-utils -y && \
 
 # Copy Install dir from builder to current image
 COPY --from=builder --chown=1000:1000 $INSTALL_DIR $INSTALL_DIR
+COPY --from=builder --chown=1000:1000 $CONFIG_DIR $INSTALL_DIR/config/
 
 # Set workdir and user
 WORKDIR $INSTALL_DIR
diff --git a/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh b/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh
index 28fbf768..2cb5b858 100644
--- a/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh
+++ b/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh
@@ -1,25 +1,12 @@
 #!/bin/bash
 # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 
-wazuh_url="${WAZUH_API_URL:-https://wazuh}"
-wazuh_port="${API_PORT:-55000}"
-api_username="${API_USERNAME:-wazuh-wui}"
-api_password="${API_PASSWORD:-wazuh-wui}"
-api_run_as="${RUN_AS:-false}"
-export DH_OPTIONS
-
-export NAME=wazuh-dashboard
-export INSTALLATION_DIR=/usr/share/${NAME}
-export CONFIG_DIR=${INSTALLATION_DIR}/config
-
-dashboard_config_file="${CONFIG_DIR}/opensearch_dashboards.yml"
-
 declare -A CONFIG_MAP=(
-  [url]=$wazuh_url
-  [port]=$wazuh_port
-  [username]=$api_username
-  [password]=$api_password
-  [run_as]=$api_run_as
+  [url]=$WAZUH_API_URL
+  [port]=$API_PORT
+  [username]=$API_USERNAME
+  [password]=$API_PASSWORD
+  [run_as]=$RUN_AS
   [pattern]=$PATTERN
   [checks.pattern]=$CHECKS_PATTERN
   [checks.template]=$CHECKS_TEMPLATE
@@ -39,6 +26,6 @@ declare -A CONFIG_MAP=(
 for i in "${!CONFIG_MAP[@]}"
 do
     if [ "${CONFIG_MAP[$i]}" != "" ]; then
-        sed -i 's/.*#'"$i"'.*/'"$i"': '"${CONFIG_MAP[$i]}"'/' $dashboard_config_file
+        sed -i 's/.*#'"$i"'.*/'"$i"': '"${CONFIG_MAP[$i]}"'/' $OPENSEARCH_DASHBOARDS_CONFIG
     fi
 done