Merge branch 'develop' into refactor/env-process-into-config-file

Signed-off-by: rockito10 <[email protected]>

Author: rockito10

.env.demo

@@ -121,7 +121,7 @@ AFJ_AGENT_SPIN_UP=/agent-provisioning/AFJ/scripts/docker_start_agent.sh
 AFJ_AGENT_ENDPOINT_PATH=/agent-provisioning/AFJ/endpoints/
 # Uncomment bellow three lines and comment the above to start services locally without using docker, using pnpm
 # AFJ_AGENT_TOKEN_PATH=/apps/agent-provisioning/AFJ/token/
-# AFJ_AGENT_SPIN_UP=/apps/agent-provisioning/AFJ/scripts/docker_start_agent.sh
+# AFJ_AGENT_SPIN_UP=/apps/agent-provisioning/AFJ/scripts/start_agent.sh
 # AFJ_AGENT_ENDPOINT_PATH=/apps/agent-provisioning/AFJ/endpoints/
 
 AGENT_PROTOCOL=http
@@ -131,13 +131,13 @@ MAX_ORG_LIMIT=10
 FIDO_API_ENDPOINT=http://localhost:8000
 
 IS_ECOSYSTEM_ENABLE=false
-CONSOLE_LOG_FLAG=true // Enable or disable console ELK logs
-ELK_LOG=true // ELK flag
-LOG_LEVEL=debug // ELK log level
-ELK_LOG_PATH = "http://localhost:9200/" // ELK log path
-ELK_USERNAME=elastic // ELK user username
-ELK_PASSWORD=xxxxxx // ELK user password
+CONSOLE_LOG_FLAG=true # Enable or disable console ELK logs
+ELK_LOG=false # ELK flag
+LOG_LEVEL=debug # ELK log level
+ELK_LOG_PATH= "http://localhost:9200/" # ELK log path
+ELK_USERNAME=elastic # ELK user username
+ELK_PASSWORD=xxxxxx # ELK user password
 
 ORGANIZATION=credebl
 CONTEXT=platform
-APP=api
+APP=api

apps/agent-provisioning/AFJ/scripts/start_agent.sh

@@ -209,7 +209,7 @@ if [ $? -eq 0 ]; then
 
   docker rm -f "${PROJECT_NAME}" || true
 
-  docker-compose -f $FILE_NAME --project-name "${PROJECT_NAME}" up -d
+  docker compose -f $FILE_NAME --project-name "${PROJECT_NAME}" up -d
   if [ $? -eq 0 ]; then
 
     n=0
@@ -271,4 +271,4 @@ else
   echo "ERROR : Failed to execute!" && exit 125
 fi
 
-echo "Total time elapsed: $(date -ud "@$(($(date +%s) - $START_TIME))" +%T) (HH:MM:SS)"
+echo "Total time elapsed: $(date -ud "@$(($(date +%s) - $START_TIME))" +%T) (HH:MM:SS)"