Merge pull request #88 from TeamPu/fix/#70

Flyway 데이터베이스 연결 설정 수정
Gobongbab · Dec 4, 2024 · cde2d98 · cde2d98
2 parents b0764c6 + 5ddb80e
commit cde2d98
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -46,10 +46,9 @@ jobs:
         run: ./gradlew flywayMigrate
         env:
           SPRING_PROFILES_ACTIVE: cd
-          SPRING_DATASOURCE_URL: jdbc:mysql://${{ secrets.DB_HOST }}:3306/teampu
-          SPRING_DATASOURCE_USERNAME: root
-          SPRING_DATASOURCE_PASSWORD: ${{ secrets.DB_PASSWORD }}
-          FLYWAY_BASELINE_ON_MIGRATE: "true"
+          DB_HOST: ${{ secrets.DB_HOST }}
+          DB_USERNAME: root
+          DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
 
       - name: Set lowercase repository name without owner environment variable
         run: |

diff --git a/src/main/resources/application-cd.yml b/src/main/resources/application-cd.yml
@@ -4,6 +4,10 @@ spring:
     url: jdbc:mysql://${DB_HOST}:3306/teampu
     username: root
     password: ${DB_PASSWORD}
+  flyway:
+    enabled: true
+    baseline-on-migrate: true
+    locations: classpath:db/migration
 
   jpa:
     database-platform: org.hibernate.dialect.MySQLDialect
@@ -14,11 +18,6 @@ spring:
         show_sql: false
         format_sql: true
 
-  flyway:
-    enabled: true
-    baseline-on-migrate: true
-    locations: classpath:db/migration
-
   data:
     redis:
       host: localhost