Merge branch 'main' into move-docker-compose

# Conflicts:
#	tools/deployment/package/etc/docker-compose/docker-compose-all.yaml

Author: junhaoliao

components/clp-package-utils/clp_package_utils/controller.py

@@ -588,11 +588,7 @@ def _set_up_env_for_mcp_server(self) -> EnvVarsDict:
         component_name = MCP_SERVER_COMPONENT_NAME
         if self._clp_config.mcp_server is None:
             logger.info(f"The MCP Server is not configured, skipping {component_name} creation...")
-            return EnvVarsDict(
-                {
-                    "CLP_MCP_ENABLED": "0",
-                }
-            )
+            return EnvVarsDict()
         logger.info(f"Setting up environment for {component_name}...")
 
         logs_dir = self._clp_config.logs_directory / component_name
@@ -603,6 +599,11 @@ def _set_up_env_for_mcp_server(self) -> EnvVarsDict:
 
         env_vars = EnvVarsDict()
 
+        # Service enablement
+        env_vars |= {
+            "CLP_MCP_SERVER_ENABLED": "1",
+        }
+
         # Connection config
         env_vars |= {
             "CLP_MCP_HOST": _get_ip_from_hostname(self._clp_config.mcp_server.host),

tools/deployment/package/etc/docker-compose/docker-compose-all.yaml

@@ -454,7 +454,7 @@ services:
     hostname: "mcp_server"
     deploy:
       # Value must be either 0 or 1. Set to 0 to disable the MCP server.
-      replicas: "${CLP_MCP_ENABLED:-0}"
+      replicas: "${CLP_MCP_SERVER_ENABLED:-0}"
     environment:
       CLP_LOGGING_LEVEL: "${CLP_MCP_LOGGING_LEVEL:-INFO}"
       CLP_LOGS_DIR: "/var/log/mcp_server"