Merge pull request #195 from teamterning/main

[🔥 !hotfix] [3차] 스테이징 서버 마이그레이션 진행
teamterning · Jan 18, 2025 · 6b6e2f5 · 6b6e2f5
2 parents a4ade93 + 2fbcbd2
commit 6b6e2f5
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/DOCKER-CD-STAGING.yml b/.github/workflows/DOCKER-CD-STAGING.yml
@@ -70,8 +70,8 @@ jobs:
 
       - name: docker image 빌드 및 푸시
         run: |
-          docker build -f Dockerfile-staging --platform linux/amd64 -t terningpoint/terning-staging .
-          docker push terningpoint/terning-staging
+          docker build -f Dockerfile-staging --platform linux/amd64 -t terningpoint/terning2025-staging .
+          docker push terningpoint/terning2025-staging
         working-directory: ${{ env.working-directory }}
 
   cd:

diff --git a/.github/workflows/DOCKER-CD.yml b/.github/workflows/DOCKER-CD.yml
@@ -65,8 +65,8 @@ jobs:
 
       - name: docker image 빌드 및 푸시
         run: |
-          docker build --platform linux/amd64 -t terningpoint/terning-deploy .
-          docker push terningpoint/terning-deploy
+          docker build --platform linux/amd64 -t terningpoint/terning2025 .
+          docker push terningpoint/terning2025
         working-directory: ${{ env.working-directory }}
 
   cd:

diff --git a/README.md b/README.md
@@ -34,9 +34,10 @@
 <br/>
 
 
+
 ##  Back-end (Spring 🌱)
 
-| <img src="https://github.com/user-attachments/assets/8e71a4f2-70e7-4a80-b658-de0eea90b0e0" width=300px alt="서버/정정교"/>  | <img src="https://github.com/user-attachments/assets/7cdc140f-5281-45b5-88ac-a952cc327247" width=300px alt="서버/신정윤"/>  | <img src="https://github.com/user-attachments/assets/54c89379-08b8-4737-8da0-5bfad27e49fe" width=300px alt="서버/권장순"/>
+| <img src="https://github.com/user-attachments/assets/8e71a4f2-70e7-4a80-b658-de0eea90b0e0" width=300px alt="서버/정정교"/>  | <img src="https://github.com/user-attachments/assets/7cdc140f-5281-45b5-88ac-a952cc327247" width=300px alt="서버/신정윤"/>  | <img src="https://github.com/user-attachments/assets/4f3006b2-4869-408e-b12b-d954a5b79d9d" width=300px alt="서버/권장순"/>
 | :-----: | :-----: | :-----: |
 | [정정교/Junggyo1020](https://github.com/junggyo1020) | [신정윤/JungYoonShin](https://github.com/JungYoonShin) | [권장순/jsoonworld](https://github.com/jsoonworld) |
 

diff --git a/src/main/java/org/terning/terningserver/config/SwaggerConfig.java b/src/main/java/org/terning/terningserver/config/SwaggerConfig.java
@@ -14,7 +14,9 @@
 @OpenAPIDefinition(
         servers = {
                 @Server(url = "https://www.terning-official.p-e.kr", description = "Default Server url"),
+                @Server(url = "https://www.terning-official.n-e.kr", description = "Default Server url (2025 ver.)"),
                 @Server(url = "http://15.165.242.132", description = "Staging Server URL"),
+                @Server(url = "http://54.180.215.35", description = "Staging Server URL (2025 ver.)"),
                 @Server(url = "http://localhost:8080", description = "Local Development Server URL")
         }
 )

diff --git a/src/main/java/org/terning/terningserver/config/WebMvcConfig.java b/src/main/java/org/terning/terningserver/config/WebMvcConfig.java
@@ -15,7 +15,9 @@ public void addCorsMappings(CorsRegistry registry) {
                         "http://localhost:8080",
                         "http://localhost:3000",
                         "https://www.terning-official.p-e.kr/",
-                        "http://15.165.242.132") // 허용할 출처 : 특정 도메인만 받을 수 있음
+                        "https://www.terning-official.n-e.kr/",
+                        "http://15.165.242.132",
+                        "http://54.180.215.35") // 허용할 출처 : 특정 도메인만 받을 수 있음
                 .allowedMethods("GET", "POST", "PUT", "DELETE", "PATCH") // 허용할 HTTP method
                 .allowCredentials(true); // 쿠키 인증 요청 허용
     }