Merge pull request #521 from Jo-Minseok/chore/sub-app-dev

📦 chore: feed-cralwer, email-worker 개발 환경 개선 및 로그 범위 통일

Author: Jo-Minseok

.github/workflows/deploy_feed-crawler.yml

@@ -82,10 +82,6 @@ jobs:
             echo "DB_PASSWORD=${{ secrets.DB_PASSWORD }}"
             echo "DB_PORT=${{ secrets.DB_PORT }}"
             echo "DB_USER=${{ secrets.DB_USER }}"
-            echo "RABBITMQ_HOST=${{ secrets.RABBITMQ_HOST }}"
-            echo "RABBITMQ_PASSWORD=${{ secrets.RABBITMQ_PASSWORD }}"
-            echo "RABBITMQ_PORT=${{ secrets.RABBITMQ_PORT }}"
-            echo "RABBITMQ_USER=${{ secrets.RABBITMQ_USER }}"
             echo "REDIS_HOST=${{ secrets.REDIS_HOST }}"
             echo "REDIS_PASSWORD=${{ secrets.REDIS_PASSWORD }}"
             echo "REDIS_PORT=${{ secrets.REDIS_PORT }}"

docker-compose/docker-compose.dev.yml

@@ -81,7 +81,7 @@ services:
         - path: ../server/package.json
           action: rebuild
     profiles:
-      - was-dev
+      - was
       - default
 
   # Feed Crawler 개발 서비스
@@ -97,8 +97,6 @@ services:
         condition: service_healthy
       redis:
         condition: service_healthy
-      rabbitmq:
-        condition: service_healthy
     volumes:
       - ../feed-crawler:/var/web05-Denamu/feed-crawler
       - /var/web05-Denamu/feed-crawler/node_modules
@@ -110,6 +108,7 @@ services:
         - path: ../feed-crawler/package.json
           action: rebuild
     profiles:
+      - feed-crawler
       - default
 
   # Email Worker 개발 서비스
@@ -121,10 +120,6 @@ services:
     networks:
       - Denamu
     depends_on:
-      mysql-db:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
       rabbitmq:
         condition: service_healthy
     volumes:
@@ -139,4 +134,5 @@ services:
         - path: ../email-worker/package.json
           action: rebuild
     profiles:
+      - email-worker
       - default

docker-compose/docker-compose.infra.yml

@@ -36,7 +36,8 @@ services:
       timeout: 5s
       retries: 3
     profiles:
-      - was-dev
+      - was
+      - feed-crawler
       - default
 
   # Redis 서비스
@@ -62,7 +63,8 @@ services:
     environment:
       TZ: 'Asia/Seoul'
     profiles:
-      - was-dev
+      - was
+      - feed-crawler
       - default
 
   # RabbitMQ 서비스
@@ -90,7 +92,8 @@ services:
       retries: 5
       start_period: 40s
     profiles:
-      - was-dev
+      - was
+      - email-worker
       - default
 
 volumes:

docker-compose/docker-compose.local.yml

@@ -59,8 +59,6 @@ services:
         condition: service_healthy
       redis:
         condition: service_healthy
-      rabbitmq:
-        condition: service_healthy
     volumes:
       - ../feed-crawler/logs:/var/web05-Denamu/feed-crawler/logs
     environment:
@@ -78,10 +76,6 @@ services:
     networks:
       - Denamu
     depends_on:
-      mysql-db:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
       rabbitmq:
         condition: service_healthy
     volumes:

docker-compose/docker-compose.prod.yml

@@ -39,8 +39,6 @@ services:
         condition: service_healthy
       redis:
         condition: service_healthy
-      rabbitmq:
-        condition: service_healthy
     volumes:
       - /var/prod_data/feed-crawler/logs:/app/logs
     environment:
@@ -55,10 +53,6 @@ services:
     networks:
       - Denamu
     depends_on:
-      mysql-db:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
       rabbitmq:
         condition: service_healthy
     volumes:

email-worker/docker/Dockerfile.dev

@@ -2,18 +2,14 @@ FROM node:22-alpine AS builder
 
 WORKDIR /var/web05-Denamu/email-worker
 
-COPY ../package*.json ./
+COPY package*.json ./
 
 RUN npm ci
 
 FROM node:22-alpine
 
 WORKDIR /var/web05-Denamu/email-worker
 
-COPY .. .
-
 COPY --from=builder /var/web05-Denamu/email-worker/node_modules ./node_modules
 
-RUN touch /var/log/email-worker.log
-
-CMD ["sh", "-c", "npm run start:dev && tail -f /var/log/email-worker.log"]
+CMD ["npm","run","start:dev"]

email-worker/docker/Dockerfile.local

@@ -2,7 +2,7 @@ FROM node:22-alpine AS builder
 
 WORKDIR /var/web05-Denamu/email-worker
 
-COPY .. .
+COPY . .
 
 RUN npm ci
 
@@ -17,6 +17,4 @@ COPY --from=builder /var/web05-Denamu/email-worker/package.json .
 COPY --from=builder /var/web05-Denamu/email-worker/node_modules ./node_modules
 COPY --from=builder /var/web05-Denamu/email-worker/env ./env
 
-RUN touch /var/log/email-worker.log
-
-CMD ["sh", "-c", "npm run start && tail -f /var/log/email-worker.log"]
+CMD ["npm","run","start"]

email-worker/docker/Dockerfile.prod

@@ -1,10 +1,15 @@
 FROM node:22-alpine AS builder
+
 WORKDIR /app
+
 COPY . .
+
 RUN npm ci && npm run build
 
 FROM node:22-alpine
+
 WORKDIR /app
+
 COPY --from=builder /app/dist ./dist
 COPY --from=builder /app/package.json .
 COPY --from=builder /app/node_modules ./node_modules

email-worker/nodemon.json

@@ -0,0 +1,7 @@
+{
+  "watch": ["src"],
+  "ext": "ts,json",
+  "exec": "ts-node -r tsconfig-paths/register src/main.ts",
+  "legacyWatch": true,
+  "delay": 1000
+}