From 279c6f9c1aefefc2316f764636e2fdd2cb40bcbe Mon Sep 17 00:00:00 2001
From: GovardhanGitHub <mopur.govardhan05@gmail.com>
Date: Sun, 29 Sep 2024 00:40:39 +0530
Subject: [PATCH] db config changed

---
 docker-compose.yml                            | 19 ++++++++-----------
 .../src/main/resources/application.yml        | 10 +++++++---
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 575284e..342086e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,4 @@
-#       - DATABASE_HOST=mysql-common-mysql-1
-
+version: '3.1'
 
 services:
   cmc-new-backend:
@@ -11,19 +10,17 @@ services:
       - "8070:8080"
     environment:
       - DATABASE_HOST=mysql-common-mysql-1
+      - SPRING_DATASOURCE_URL=jdbc:mysql://mysql-common-mysql-1:3306/demo
+      - SPRING_DATASOURCE_USERNAME=youruser
+      - SPRING_DATASOURCE_PASSWORD=youruserpassword
     networks:
       - cmc-forntend
       - mysql-common_mynetwork
-    # depends_on:
-    #   db:
-    #     condition: service_healthy
-  
- 
+
 volumes:
   db-data: {}
-# secrets:
-#   db-password:
-#     file: db/password.txt
+
 networks:
   cmc-forntend: {}
-  mysql-common_mynetwork: {}
\ No newline at end of file
+  mysql-common_mynetwork:
+    external: true
\ No newline at end of file
diff --git a/support-portal-backend/src/main/resources/application.yml b/support-portal-backend/src/main/resources/application.yml
index 2115523..8cc9ad5 100644
--- a/support-portal-backend/src/main/resources/application.yml
+++ b/support-portal-backend/src/main/resources/application.yml
@@ -23,10 +23,14 @@ spring:
           ssl:
             enable: false
   datasource:
-    url: jdbc:mysql://210.18.189.94:8098/demo
+    # url: jdbc:mysql://mysql:3306/demo
+    # url: jdbc:mysql://210.18.189.94:8098/demo
     # url: jdbc:mysql://${MYSQL_HOST:db}:8098/demo
-    username: youruser
-    password: youruserpassword
+    # username: youruser
+    # password: youruserpassword
+    url: ${SPRING_DATASOURCE_URL}
+    username: ${SPRING_DATASOURCE_USERNAME}
+    password: ${SPRING_DATASOURCE_PASSWORD}
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     hibernate: