🐛 [Fix]: action script 수정

boostcampwm-2024 · Nov 28, 2024 · 815f01e · 815f01e
1 parent 33dd21c
commit 815f01e
Show file tree

Hide file tree

Showing 6 changed files with 103 additions and 35 deletions.
diff --git a/.github/workflows/chat-deploy.yml b/.github/workflows/chat-deploy.yml
@@ -22,7 +22,7 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
-      
+
       # ncloud 로그인
       - name: Log in to Ncloud Container Registry
         env:
@@ -40,10 +40,18 @@ jobs:
       - name: Push to Ncloud Container Registry
         run: |
           docker push ${{ secrets.NCLOUD_REGISTRY_URL }}/$IMAGE_NAME:latest
-      
+
   deploy-and-run:
     runs-on: ubuntu-latest
     needs: build-and-push
+    env:
+      IMAGE_NAME: chat-camon
+      CHAT_PORT: ${{ secrets.CHAT_PORT }}
+      REDIS_HOST: ${{ secrets.REDIS_HOST }}
+      REDIS_PORT: ${{ secrets.REDIS_PORT }}
+      REDIS_CHAT: ${{ secrets.REDIS_CHAT }}
+      JWT_SECRET: ${{ secrets.JWT_SECRET }}
+      NCLOUD_REGISTRY_URL: ${{ secrets.NCLOUD_REGISTRY_URL }}
 
     steps:
       - name: Checkout for docker-compose
@@ -68,13 +76,21 @@ jobs:
           envs: CHAT_PORT,REDIS_HOST,REDIS_PORT,REDIS_CHAT,JWT_SECRET
           script: |
             cd /home/${{ secrets.SERVER_USER }}/camon
+            
+            echo "CHAT_PORT=$CHAT_PORT" > .env
+            echo "REDIS_HOST=$REDIS_HOST" >> .env
+            echo "REDIS_PORT=$REDIS_PORT" >> .env
+            echo "REDIS_CHAT=$REDIS_CHAT" >> .env
+            echo "JWT_SECRET=$JWT_SECRET" >> .env
+            
             sudo docker login -u ${{secrets.NCLOUD_ACCESS_KEY}} -p ${{ secrets.NCLOUD_SECRET_KEY }} ${{ secrets.NCLOUD_REGISTRY_URL }}
 
             sudo docker stop chat-camon || true
             sudo docker rm chat-camon || true
             sudo docker rmi ${{ secrets.NCLOUD_REGISTRY_URL }}/chat-camon:latest || true
 
             sudo docker pull ${{ secrets.NCLOUD_REGISTRY_URL }}/chat-camon:latest
+            sudo docker tag ${{ secrets.NCLOUD_REGISTRY_URL }}/chat-camon:latest chat-camon
             sudo docker-compose up -d chat
             sudo docker image prune -f
 

diff --git a/.github/workflows/media-deploy.yml b/.github/workflows/media-deploy.yml
@@ -3,8 +3,9 @@ on:
   push:
     branches:
       - develop
-    paths:
-      - 'apps/media/**'
+      - Fix/295
+#    paths:
+#      - 'apps/media/**'
 
 jobs:
   build-and-push:
@@ -62,6 +63,23 @@ jobs:
   deploy-and-run:
     runs-on: ubuntu-latest
     needs: build-and-push
+    env:
+      IMAGE_NAME: media-camon
+      MEDIA_PORT: 3001
+      REDIS_HOST: ${{ secrets.REDIS_HOST }}
+      REDIS_PORT: ${{ secrets.REDIS_PORT }}
+      REDIS_MEDIA: ${{ secrets.REDIS_MEDIA }}
+      ANNOUNCED_IP: ${{ secrets.ANNOUNCED_IP }}
+      API_SERVER_URL: ${{ secrets.API_SERVER_URL }}
+      HTTP_TIMEOUT: ${{ secrets.HTTP_TIMEOUT }}
+      RECORD_SERVER_URL: ${{ secrets.RECORD_SERVER_URL }}
+      SERVER_PRIVATE_IP: ${{ secrets.SERVER_PRIVATE_IP }}
+      PUBLIC_RECORD_SERVER_URL: ${{ secrets.PUBLIC_RECORD_SERVER_URL }}
+      JWT_SECRET: ${{ secrets.JWT_SECRET }}
+      NCLOUD_REGISTRY_URL: ${{ secrets.NCLOUD_REGISTRY_URL }}
+      NCLOUD_ACCESS_KEY: ${{ secrets.NCLOUD_ACCESS_KEY }}
+      NCLOUD_SECRET_KEY: ${{ secrets.NCLOUD_SECRET_KEY }}
+
     steps:
       - name: Checkout for docker-compose
         uses: actions/checkout@v2
@@ -82,24 +100,32 @@ jobs:
           username: ${{ secrets.SERVER_USER }}
           key: ${{ secrets.SSH_SERVER_KEY }}
           port: 22
-          envs: MEDIA_PORT,REDIS_HOST,REDIS_PORT,REDIS_MEDIA,ANNOUNCED_IP,API_SERVER_URL,HTTP_TIMEOUT,RECORD_SERVER_URL,SERVER_PRIVATE_IP,PUBLIC_RECORD_SERVER_URL
+          envs: MEDIA_PORT,REDIS_HOST,REDIS_PORT,REDIS_MEDIA,ANNOUNCED_IP,API_SERVER_URL,HTTP_TIMEOUT,RECORD_SERVER_URL,SERVER_PRIVATE_IP,PUBLIC_RECORD_SERVER_URL,NCLOUD_REGISTRY_URL,NCLOUD_ACCESS_KEY,NCLOUD_SECRET_KEY
           script: |
             cd /home/${{ secrets.SERVER_USER }}/camon
-            sudo lsof -i :3001
-            sudo lsof -i :30000-31000
-            sudo docker login -u ${{secrets.NCLOUD_ACCESS_KEY}} -p ${{ secrets.NCLOUD_SECRET_KEY }} ${{ secrets.NCLOUD_REGISTRY_URL }}
-
-            echo "API_SERVER_URL=http://api:3000" >> .env
-            echo "HTTP_TIMEOUT=5000" >> .env
-            echo "RECORD_SERVER_URL=http://record:3003" >> .env
-            echo "SERVER_PRIVATE_IP=record" >> .env
-            echo "PUBLIC_RECORD_SERVER_URL=https://record.cam-on.site" >> .env
+            
+            echo "MEDIA_PORT=$MEDIA_PORT" > .env
+            echo "REDIS_HOST=$REDIS_HOST" >> .env
+            echo "REDIS_PORT=$REDIS_PORT" >> .env
+            echo "REDIS_MEDIA=$REDIS_MEDIA" >> .env
+            echo "ANNOUNCED_IP=$ANNOUNCED_IP" >> .env
+            echo "API_SERVER_URL=$API_SERVER_URL" >> .env
+            echo "HTTP_TIMEOUT=$HTTP_TIMEOUT" >> .env
+            echo "RECORD_SERVER_URL=$RECORD_SERVER_URL" >> .env
+            echo "SERVER_PRIVATE_IP=$SERVER_PRIVATE_IP" >> .env
+            echo "PUBLIC_RECORD_SERVER_URL=$PUBLIC_RECORD_SERVER_URL" >> .env
+            echo "NCLOUD_REGISTRY_URL=$NCLOUD_REGISTRY_URL" >> .env
+            echo "NCLOUD_ACCESS_KEY=$NCLOUD_ACCESS_KEY" >> .env
+            echo "NCLOUD_SECRET_KEY=$NCLOUD_SECRET_KEY" >> .env
+            echo "JWT_SECRET=$JWT_SECRET" >> .env
+            
+            sudo docker login -u $NCLOUD_ACCESS_KEY -p $NCLOUD_SECRET_KEY $NCLOUD_REGISTRY_URL
 
             sudo docker stop media-camon || true
             sudo docker rm media-camon || true
-            sudo docker rmi ${{ secrets.NCLOUD_REGISTRY_URL }}/media-camon:latest || true
+            sudo docker rmi $NCLOUD_REGISTRY_URL/media-camon:latest || true
 
-            sudo docker pull ${{ secrets.NCLOUD_REGISTRY_URL }}/media-camon:latest
+            sudo docker pull $NCLOUD_REGISTRY_URL/media-camon:latest
             sudo docker-compose up -d media
             sudo docker image prune -f
 

diff --git a/.github/workflows/record-deploy.yml b/.github/workflows/record-deploy.yml
@@ -3,8 +3,9 @@ on:
   push:
     branches:
       - develop
-    paths:
-      - 'apps/record/**'
+      - Fix/295
+#    paths:
+#      - 'apps/record/**'
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
@@ -13,8 +14,8 @@ jobs:
       IMAGE_NAME: record-camon
       RECORD_PORT: ${{ secrets.RECORD_PORT }}
       NCLOUD_ACCESS_KEY: ${{ secrets.NCLOUD_ACCESS_KEY }}
-      NCLOUD_SECRET_KEY=: ${{ secrets.NCLOUD_SECRET_KEY }}
-      NCLOUD_BUCKET_NAME=: ${{ secrets.NCLOUD_BUCKET_NAME }}
+      NCLOUD_SECRET_KEY: ${{ secrets.NCLOUD_SECRET_KEY }}
+      NCLOUD_BUCKET_NAME: ${{ secrets.NCLOUD_BUCKET_NAME }}
 
     steps:
       - name: Checkout code
@@ -33,7 +34,7 @@ jobs:
           docker build -f ./apps/record/Dockerfile -t ${{ secrets.NCLOUD_REGISTRY_URL }}/$IMAGE_NAME:latest \
             --build-arg RECORD_PORT=$RECORD_PORT \
             --build-arg NCLOUD_ACCESS_KEY=$NCLOUD_ACCESS_KEY \
-            --build-arg NCLOUD_SECRET_KEY=$NCLOUD_ACCESS_KEY \
+            --build-arg NCLOUD_SECRET_KEY=$NCLOUD_SECRET_KEY \
             --build-arg NCLOUD_BUCKET_NAME=$NCLOUD_BUCKET_NAME \
             .
 
@@ -44,6 +45,13 @@ jobs:
   deploy-and-run:
     runs-on: ubuntu-latest
     needs: build-and-push
+    env:
+      IMAGE_NAME: record-camon
+      RECORD_PORT: ${{ secrets.RECORD_PORT }}
+      NCLOUD_ACCESS_KEY: ${{ secrets.NCLOUD_ACCESS_KEY }}
+      NCLOUD_SECRET_KEY: ${{ secrets.NCLOUD_SECRET_KEY }}
+      NCLOUD_BUCKET_NAME: ${{ secrets.NCLOUD_BUCKET_NAME }}
+      NCLOUD_REGISTRY_URL: ${{ secrets.NCLOUD_REGISTRY_URL }}
     steps:
       - name: Checkout for docker-compose
         uses: actions/checkout@v2
@@ -64,19 +72,29 @@ jobs:
           username: ${{ secrets.SERVER_USER }}
           key: ${{ secrets.SSH_SERVER_KEY }}
           port: 22
-          envs: RECORD_PORT,NCLOUD_ACCESS_KEY,NCLOUD_SECRET_KEY,NCLOUD_BUCKET_NAME
+          envs: RECORD_PORT,NCLOUD_ACCESS_KEY,NCLOUD_SECRET_KEY,NCLOUD_BUCKET_NAME,NCLOUD_REGISTRY_URL
           script: |
             cd /home/${{ secrets.SERVER_USER }}/camon
-            sudo docker login -u ${{secrets.NCLOUD_ACCESS_KEY}} -p ${{ secrets.NCLOUD_SECRET_KEY }} ${{ secrets.NCLOUD_REGISTRY_URL }}
+            
+            echo "RECORD_PORT=$RECORD_PORT" > .env
+            echo "NCLOUD_ACCESS_KEY=$NCLOUD_ACCESS_KEY" >> .env
+            echo "NCLOUD_SECRET_KEY=$NCLOUD_SECRET_KEY" >> .env
+            echo "NCLOUD_BUCKET_NAME=$NCLOUD_BUCKET_NAME" >> .env
+            echo "NCLOUD_REGISTRY_URL=$NCLOUD_REGISTRY_URL" >> .env
+            
+            sudo docker login -u $NCLOUD_ACCESS_KEY -p $NCLOUD_SECRET_KEY $NCLOUD_REGISTRY_URL
 
             sudo docker stop record-camon || true
             sudo docker rm record-camon || true
-            sudo docker rmi ${{ secrets.NCLOUD_REGISTRY_URL }}/record-camon:latest || true
-
-            sudo docker pull ${{ secrets.NCLOUD_REGISTRY_URL }}/$IMAGE_NAME:latest
+            sudo docker rmi $NCLOUD_REGISTRY_URL/record-camon:latest || true
+      
+            sudo docker pull $NCLOUD_REGISTRY_URL/record-camon:latest
+            sudo docker tag $NCLOUD_REGISTRY_URL/record-camon:latest record-camon
+
+            sudo docker-compose down
             sudo docker-compose up -d record
+
             sudo docker image prune -f
-
       - name: Check container status
         uses: appleboy/[email protected]
         with:

diff --git a/apps/chat/src/auth/jwt-auth.strategy.ts b/apps/chat/src/auth/jwt-auth.strategy.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { PassportStrategy } from '@nestjs/passport';
 import { ExtractJwt, Strategy } from 'passport-jwt';
-import { IPayLoad } from './\bpayload.interface';
+import { IPayLoad } from './payload.interface';
 
 @Injectable()
 export class JWTAuthStrategy extends PassportStrategy(Strategy) {

diff --git a/apps/record/Dockerfile b/apps/record/Dockerfile
@@ -20,7 +20,6 @@ ENV RECORD_PORT=$RECORD_PORT
 ENV NCLOUD_ACCESS_KEY=$NCLOUD_ACCESS_KEY
 ENV NCLOUD_SECRET_KEY=$NCLOUD_SECRET_KEY
 ENV NCLOUD_BUCKET_NAME=$NCLOUD_BUCKET_NAME
-
 # Copy dependency files
 COPY pnpm-lock.yaml package.json pnpm-workspace.yaml ./
 COPY apps/record/package.json apps/record/

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -38,22 +38,28 @@ services:
       - SERVER_PRIVATE_IP=${SERVER_PRIVATE_IP}
       - PUBLIC_RECORD_SERVER_URL=${PUBLIC_RECORD_SERVER_URL}
 
-
   chat:
     container_name: chat-camon
-    image: ${NCLOUD_REGISTRY_URL}/chat-camon
+    image: chat-camon
     networks:
       - camon
-    expose:
-      - "3002"
     ports:
       - "3002:3002"
+    environment:
+      - CHAT_PORT=${CHAT_PORT}
+      - REDIS_HOST=${REDIS_HOST}
+      - REDIS_PORT=${REDIS_PORT}
+      - REDIS_CHAT=${REDIS_CHAT}
+      - JWT_SECRET=${JWT_SECRET}
 
   record:
     container_name: record-camon
     image: ${NCLOUD_REGISTRY_URL}/record-camon
     networks:
-      - camon
+      camon:
+        ipv4_address: 172.19.0.10
+    expose:
+        - "3003"
     ports:
       - "3003:3003"
     environment:
@@ -63,4 +69,7 @@ services:
 
 networks:
   camon:
-    driver: bridge
+    driver: bridge
+    ipam:
+      config:
+        - subnet: 172.19.0.0/16