Merge branch 'develop' of https://github.com/Korea-Certified-Store/ba…

…ckend into refactor/refactor-storecertification-api(#69)
Korea-Certified-Store · Jan 20, 2024 · 2f3c308 · 2f3c308
2 parents 9650f3a + 8e7046a
commit 2f3c308
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/action-production-cd.yml b/.github/workflows/action-production-cd.yml
@@ -40,14 +40,14 @@ jobs:
           chmod +x ./gradlew
           ./gradlew clean build -x test
 
-      # 도커 컴포즈 설정 파일 서버로 전달
-      - name: Send docker-compose.yml
+      # 설정 파일 서버로 전달
+      - name: Send docker-compose.yml and nginx
         uses: appleboy/scp-action@master
         with:
           username: ${{ secrets.KCS_USERNAME_PROD }}
           host: ${{ secrets.KCS_HOST_PROD }}
           key: ${{ secrets.KCS_KEY_PROD }}
-          source: "src/main/resources/backend-submodule/docker-compose.yml"
+          source: "src/main/resources/backend-submodule/docker-compose.yml,src/main/resources/backend-submodule/nginx/nginx.conf"
           target: "/home/g22203/"
 
       # Docker hub 로그인
@@ -82,5 +82,6 @@ jobs:
             docker-compose -f docker-compose.yml down
             docker rmi $(docker images -q)
             cp -f ./src/main/resources/backend-submodule/docker-compose.yml .
+            cp -rf ./src/main/resources/backend-submodule/nginx .
             rm -r src
             docker-compose -f docker-compose.yml up -d
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
@@ -4,12 +4,11 @@ events {
 
 http {
 
-    # -------------------- spring-boot-prod WAS --------------------
+    # -------------------- spring-boot-dev WAS --------------------
     upstream backend {
         server server:8080;
     }
 
-    # -------------------- spring-boot-dev WAS --------------------
     server {
         listen 80;
         server_name dev.nainga.store;