Merge pull request #957 from ase-101/release-1.5.x

ES-842 Using mulitple profiles to avoid duplicate configuration
mosip · Oct 16, 2024 · b82cffd · b82cffd
2 parents 0120dcf + 2988440
commit b82cffd
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 368 deletions.
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
@@ -24,18 +24,15 @@ services:
       - database
 
   esignet:
-    image: 'mosipdev/esignet:release-1.5.x'
+    image: mosipdev/esignet:release-1.5.x
     user: root
     ports: 
       - 8088:8088
     environment:
       - container_user=mosip
-      - active_profile_env=local
+      - active_profile_env=default,local
       - plugin_name_env=esignet-mock-plugin.jar
-      - KAFKA_ENABLED=false
-      - SPRING_AUTOCONFIGURE_EXCLUDE=org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration
       - SPRING_DATASOURCE_URL=jdbc:postgresql://database:5432/mosip_esignet?currentSchema=esignet
-      - SPRING_CACHE_TYPE=simple
       - MOSIP_ESIGNET_MOCK_DOMAIN_URL=http://mock-identity-system:8082
     depends_on:
       - database

diff --git a/esignet-service/configure_start.sh b/esignet-service/configure_start.sh
@@ -69,5 +69,12 @@ else
   exit 1
 fi
 
+## set active profile if not set
+if [[ -z "$active_profile_env" ]]; then
+  echo "Alert: active_profile_env is not set. setting to default"
+  active_profile_env="default"
+  export active_profile_env
+fi
+
 cd $work_dir
 exec "$@"