From ac1960a36fd6a3894ab5053ada926d1511dd6017 Mon Sep 17 00:00:00 2001
From: Mithun James <1007084+drtechie@users.noreply.github.com>
Date: Wed, 18 Jun 2025 12:35:48 +0530
Subject: [PATCH] fix: drive is production with a env variable

---
 src/main/environment/common_ci.properties     | 5 +----
 src/main/environment/common_docker.properties | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties
index 714c82a8..2defbace 100644
--- a/src/main/environment/common_ci.properties
+++ b/src/main/environment/common_ci.properties
@@ -167,7 +167,7 @@ springdoc.api-docs.enabled=false
 springdoc.swagger-ui.enabled=false
 
 
-isProduction=true
+isProduction=@env.IS_PRODUCTION@
 grievanceAllocationRetryConfiguration=3
 
 start-grievancedatasync-scheduler=false
@@ -177,10 +177,7 @@ captcha.secret-key=@env.CAPTCHA_SECRET_KEY@
 captcha.verify-url=@env.CAPTCHA_VERIFY_URL@
 captcha.enable-captcha=@env.ENABLE_CAPTCHA@
 
-<<<<<<< HEAD
-=======
 cors.allowed-origins=@env.CORS_ALLOWED_ORIGINS@
 
 
->>>>>>> develop
 
diff --git a/src/main/environment/common_docker.properties b/src/main/environment/common_docker.properties
index e8db9037..56e2a2fe 100644
--- a/src/main/environment/common_docker.properties
+++ b/src/main/environment/common_docker.properties
@@ -168,7 +168,7 @@ springdoc.api-docs.enabled=false
 springdoc.swagger-ui.enabled=false
 
 
-isProduction=true
+isProduction=${IS_PRODUCTION}
 grievanceAllocationRetryConfiguration=3
 
 start-grievancedatasync-scheduler=false