Merge pull request #18 from gaaji/GM-185

GM-185 회원 서비스 설정 파일 수정 및 CI 파일 수정
gaaji · Feb 1, 2023 · eeb0214 · eeb0214
2 parents 12b4d07 + 0786e95
commit eeb0214
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,11 +33,11 @@ jobs:
         SECRET_FILE_NAME: secret.yml
       run: echo $SECRET_CODE | base64 --decode > $SECRET_DIR/$SECRET_FILE_NAME
 
-    - name: Create application-oauth.yml
+    - name: Create oauth.yml
       env:
        SECRET_CODE: ${{ secrets.OAUTH }}
        SECRET_DIR: src/main/resources
-       SECRET_FILE_NAME: application-oauth.yml
+       SECRET_FILE_NAME: oauth.yml
       run: echo $SECRET_CODE | base64 --decode > $SECRET_DIR/$SECRET_FILE_NAME
 
     - name: Grant execute permission for gradlew

diff --git a/.gitignore b/.gitignore
@@ -37,5 +37,5 @@ out/
 .vscode/
 
 ### security
-/src/main/resources/application-oauth.yml
+/src/main/resources/oauth.yml
 /src/main/resources/secret.yml
diff --git a/src/main/resources/application-docker.yml b/src/main/resources/application-docker.yml
@@ -2,6 +2,11 @@ spring:
   config:
     activate:
       on-profile: "docker"
+    import:
+      - secret.yml
+      - oauth.yml
+  application:
+    name: auth-service
 
   redis:
     host: redis

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -3,11 +3,12 @@ spring:
     group:
       "default":
         - "dev"
-        - "oauth"
   application:
     name: auth-service
   config:
-    import: secret.yml
+    import:
+      - secret.yml
+      - oauth.yml
 
 eureka:
   client: