Skip to content

Commit 7e89a12

Browse files
authored
Merge pull request #134 from DevKor-github/develop
#133까지 반영해 배포
2 parents b1ba279 + 72ec9d6 commit 7e89a12

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/deploy-to-dev-ec2.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ jobs:
107107
DB_USERNAME="${{ secrets.DB_USERNAME }}" \
108108
DB_PASSWORD="${{ secrets.DB_PASSWORD }}" \
109109
JWT_SECRET="${{ secrets.JWT_SECRET }}" \
110-
FRONTEND_SERVER_URL="${{ secrets.FRONTEND_SERVER_URL }}" \
110+
FRONTEND_DEV_URL="${{ secrets.FRONTEND_DEV_URL }}" \
111+
FRONTEND_DEV_URL_2="${{ secrets.FRONTEND_DEV_URL_2 }}" \
111112
SWAGGER_SERVER_URL="${{ secrets.SWAGGER_SERVER_URL }}" \
112113
SWAGGER_ORIGIN_PUBLIC_IP="${{ secrets.SWAGGER_ORIGIN_PUBLIC_IP }}" \
113114
SWAGGER_ORIGIN_DOMAIN="${{ secrets.SWAGGER_ORIGIN_DOMAIN }}" \

.github/workflows/deploy-to-prod-ec2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
DB_USERNAME="${{ secrets.DB_USERNAME }}" \
109109
DB_PASSWORD="${{ secrets.DB_PASSWORD }}" \
110110
JWT_SECRET="${{ secrets.JWT_SECRET }}" \
111-
FRONTEND_SERVER_URL="${{ secrets.FRONTEND_SERVER_URL }}" \
111+
FRONTEND_PROD_URL="${{ secrets.FRONTEND_PROD_URL }}" \
112112
NAVER_CLIENT_ID="${{ secrets.NAVER_CLIENT_ID }}" \
113113
NAVER_CLIENT_SECRET="${{ secrets.NAVER_CLIENT_SECRET }}" \
114114
NAVER_REDIRECT_URI="${{ secrets.NAVER_REDIRECT_URI }}" \

src/main/resources/application-dev.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ cors:
5050
allowed-origins:
5151
- http://localhost:3000
5252
- http://localhost:5173
53-
- ${FRONTEND_SERVER_URL}
53+
- ${FRONTEND_DEV_URL}
54+
- ${FRONTEND_DEV_URL_2}
5455
- ${SWAGGER_ORIGIN_PUBLIC_IP}
5556
- ${SWAGGER_ORIGIN_DOMAIN}

src/main/resources/application-prod.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,4 @@ app:
4848

4949
cors:
5050
allowed-origins:
51-
- http://localhost:3000
52-
- http://localhost:5173
53-
- ${FRONTEND_SERVER_URL}
51+
- ${FRONTEND_PROD_URL}

0 commit comments

Comments
 (0)