From bc82210d92a6178d664a15c6b6875628e98b2122 Mon Sep 17 00:00:00 2001
From: Dewmin Deniyegedara <dewminkasmitha30@gmail.com>
Date: Sun, 14 Dec 2025 01:27:30 +0530
Subject: [PATCH 1/2] fix:adapt for changed  secrets

---
 .github/workflows/maven.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index f74a630..442a1b3 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -55,11 +55,11 @@ jobs:
             docker pull dewmink/embula-backend:latest
             docker stop embula-backend || true
             docker rm embula-backend || true
-            docker run -d --name embula-backend -p 8081:8081 -e MYSQL_URL="$MYSQL_URL" -e MYSQL_USERNAME="$MYSQL_USERNAME" -e MYSQL_PASSWORD="$MYSQL_PASSWORD" -e JWT_SECRET="$JWT_SECRET" -e TOKEN_VALIDITY="$TOKEN_VALIDITY" -e REFRESH_TOKEN_VALIDITY="$REFRESH_TOKEN_VALIDITY" -e STRIPE_SECRET="$STRIPE_SECRET" -e EMAIL_USERNAME="$EMAIL_USERNAME" -e EMAIL_PASSWORD="$EMAIL_PASSWORD" -e ADMIN_EMAIL="$ADMIN_EMAIL" dewmink/embula-backend:latest
+            docker run -d --name embula-backend -p 8081:8081 -e MYSQL_URL="$MYSQL_URL" -e USERNAME="$USERNAME" -e PASSWORD="$PASSWORD" -e JWT_SECRET="$JWT_SECRET" -e TOKEN_VALIDITY="$TOKEN_VALIDITY" -e REFRESH_TOKEN_VALIDITY="$REFRESH_TOKEN_VALIDITY" -e STRIPE_SECRET="$STRIPE_SECRET" -e EMAIL_USERNAME="$EMAIL_USERNAME" -e EMAIL_PASSWORD="$EMAIL_PASSWORD" -e ADMIN_EMAIL="$ADMIN_EMAIL" dewmink/embula-backend:latest
         env:
           MYSQL_URL: ${{ secrets.MYSQL_URL }}
-          MYSQL_USERNAME: ${{ secrets.DB_USERNAME }}
-          MYSQL_PASSWORD: ${{ secrets.DB_PASSWORD }}
+          USERNAME: ${{ secrets.USERNAME }}
+          PASSWORD: ${{ secrets.PASSWORD }}
           JWT_SECRET: ${{ secrets.JWT_SECRET }}
           TOKEN_VALIDITY: ${{ secrets.TOKEN_VALIDITY }}
           REFRESH_TOKEN_VALIDITY: ${{ secrets.REFRESH_TOKEN_VALIDITY }}

From f7b0d6a1103a9e940e597dc04f57105087422feb Mon Sep 17 00:00:00 2001
From: Dewmin Deniyegedara <dewminkasmitha30@gmail.com>
Date: Sun, 14 Dec 2025 01:33:30 +0530
Subject: [PATCH 2/2] fix:username and password for docker image

---
 .github/workflows/maven.yml               | 6 +++---
 src/main/resources/application.properties | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 442a1b3..49dafc2 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -55,11 +55,11 @@ jobs:
             docker pull dewmink/embula-backend:latest
             docker stop embula-backend || true
             docker rm embula-backend || true
-            docker run -d --name embula-backend -p 8081:8081 -e MYSQL_URL="$MYSQL_URL" -e USERNAME="$USERNAME" -e PASSWORD="$PASSWORD" -e JWT_SECRET="$JWT_SECRET" -e TOKEN_VALIDITY="$TOKEN_VALIDITY" -e REFRESH_TOKEN_VALIDITY="$REFRESH_TOKEN_VALIDITY" -e STRIPE_SECRET="$STRIPE_SECRET" -e EMAIL_USERNAME="$EMAIL_USERNAME" -e EMAIL_PASSWORD="$EMAIL_PASSWORD" -e ADMIN_EMAIL="$ADMIN_EMAIL" dewmink/embula-backend:latest
+            docker run -d --name embula-backend -p 8081:8081 -e MYSQL_URL="$MYSQL_URL" -e MYSQL_USERNAME="$MYSQL_USERNAME" -e MYSQL_PASSWORD="$MYSQL_PASSWORD" -e JWT_SECRET="$JWT_SECRET" -e TOKEN_VALIDITY="$TOKEN_VALIDITY" -e REFRESH_TOKEN_VALIDITY="$REFRESH_TOKEN_VALIDITY" -e STRIPE_SECRET="$STRIPE_SECRET" -e EMAIL_USERNAME="$EMAIL_USERNAME" -e EMAIL_PASSWORD="$EMAIL_PASSWORD" -e ADMIN_EMAIL="$ADMIN_EMAIL" dewmink/embula-backend:latest
         env:
           MYSQL_URL: ${{ secrets.MYSQL_URL }}
-          USERNAME: ${{ secrets.USERNAME }}
-          PASSWORD: ${{ secrets.PASSWORD }}
+          MYSQL_USERNAME: ${{ secrets.MYSQL_USERNAME }}
+          MYSQL_PASSWORD: ${{ secrets.MYSQL_PASSWORD }}
           JWT_SECRET: ${{ secrets.JWT_SECRET }}
           TOKEN_VALIDITY: ${{ secrets.TOKEN_VALIDITY }}
           REFRESH_TOKEN_VALIDITY: ${{ secrets.REFRESH_TOKEN_VALIDITY }}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 5227ca3..8c135f5 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -6,8 +6,8 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
 
 spring.datasource.url =${MYSQL_URL}
-spring.datasource.username= ${USERNAME}
-spring.datasource.password=${PASSWORD}
+spring.datasource.username= ${MYSQL_USERNAME}
+spring.datasource.password=${MYSQL_PASSWORD}
 
 #jpa vendor adapter configuration
 spring.jpa.database-platform=org.hibernate.dialect.MySQLDialect