Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1f48cf8
๐Ÿ“ฆ chore: feed-crawler, email-worker ๊ฐœ๋ฐœ ๋ช…๋ น ์ถ”๊ฐ€
Jo-Minseok Jan 13, 2026
9107e4a
๐Ÿ› fix: local ํฌํŠธํด๋ฆฌ์˜ค ํ™˜๊ฒฝ rebuild ์ถ”๊ฐ€
Jo-Minseok Jan 13, 2026
5aba880
๐Ÿ“ฆ chore: docker compose email-worker mysql, redis ์˜์กด ์ œ๊ฑฐ
Jo-Minseok Jan 13, 2026
8da0f94
๐Ÿ“ฆ chore: docker compose feed crawler ์˜์กด ์ œ๊ฑฐ
Jo-Minseok Jan 13, 2026
3c61dde
๐Ÿ“ฆ chore: feed-crawler amqp ๋ชจ๋“ˆ ์ œ๊ฑฐ
Jo-Minseok Jan 13, 2026
1b03d74
๐Ÿงผ clean: feed crawler rabbitMQ ์ œ๊ฑฐ
Jo-Minseok Jan 13, 2026
56fe337
๐Ÿ“ฆ chore: docker compose dev watch ์ถ”๊ฐ€
Jo-Minseok Jan 13, 2026
65547fb
๐Ÿ“ฆ chore: feed crawler ๊ฐœ๋ฐœ ๋ชจ๋“œ watch ์ถ”๊ฐ€
Jo-Minseok Jan 13, 2026
acc8c2f
๐Ÿ“ฆ chore: email worker ๊ฐœ๋ฐœ ๋ชจ๋“œ watch ์ถ”๊ฐ€
Jo-Minseok Jan 13, 2026
17419c2
๐Ÿ“ฆ chore: feed crawler, email-worker ์˜์กด ์ธํ”„๋ผ ์ œ๊ฑฐ
Jo-Minseok Jan 13, 2026
d90f17b
๐Ÿงผ clean: server docker file ๊ฐœ์„ 
Jo-Minseok Jan 13, 2026
d38aaf6
๐Ÿงผ clean: email worker docker file ๊ฐœ์„ 
Jo-Minseok Jan 13, 2026
be0363b
๐Ÿงผ clean: feed crawler docker file ๊ฐœ์„ 
Jo-Minseok Jan 13, 2026
4898dde
๐Ÿ› fix: docker local ํ™˜๊ฒฝ ์ปจํ…Œ์ด๋„ˆ ์ถœ๋ ฅ ๋ณ€๊ฒฝ
Jo-Minseok Jan 13, 2026
53599e7
โ™ป๏ธ refactor: feed crawler ๋กœ๊ทธ ์ถœ๋ ฅ ๋ฒ”์œ„ ์ˆ˜์ •
Jo-Minseok Jan 13, 2026
33c5ad8
โ™ป๏ธ refactor: email ๋กœ๊ทธ ์ถœ๋ ฅ ๋ฒ”์œ„ ์ˆ˜์ •
Jo-Minseok Jan 13, 2026
1e6a83e
โ™ป๏ธ refactor: server ๋กœ๊ทธ ์ถœ๋ ฅ ๋ฒ”์œ„ ์ˆ˜์ •
Jo-Minseok Jan 13, 2026
5d013d4
๐Ÿงผ clean: ํ•„์š”์—†๋Š” ํ™˜๊ฒฝ ๋ณ€์ˆ˜ ์ฃผ์ž… ์ œ๊ฑฐ
Jo-Minseok Jan 13, 2026
92111bb
๐Ÿ› fix: ํ™˜๊ฒฝ ๋ณ€์ˆ˜ ๋ช…์นญ ๋ณ€๊ฒฝ
Jo-Minseok Jan 13, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/deploy_feed-crawler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
10 changes: 3 additions & 7 deletions docker-compose/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ services:
- path: ../server/package.json
action: rebuild
profiles:
- was-dev
- was
- default

# Feed Crawler ๊ฐœ๋ฐœ ์„œ๋น„์Šค
Expand All @@ -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
Expand All @@ -110,6 +108,7 @@ services:
- path: ../feed-crawler/package.json
action: rebuild
profiles:
- feed-crawler
- default

# Email Worker ๊ฐœ๋ฐœ ์„œ๋น„์Šค
Expand All @@ -121,10 +120,6 @@ services:
networks:
- Denamu
depends_on:
mysql-db:
condition: service_healthy
redis:
condition: service_healthy
rabbitmq:
condition: service_healthy
volumes:
Expand All @@ -139,4 +134,5 @@ services:
- path: ../email-worker/package.json
action: rebuild
profiles:
- email-worker
- default
9 changes: 6 additions & 3 deletions docker-compose/docker-compose.infra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ services:
timeout: 5s
retries: 3
profiles:
- was-dev
- was
- feed-crawler
- default

# Redis ์„œ๋น„์Šค
Expand All @@ -62,7 +63,8 @@ services:
environment:
TZ: 'Asia/Seoul'
profiles:
- was-dev
- was
- feed-crawler
- default

# RabbitMQ ์„œ๋น„์Šค
Expand Down Expand Up @@ -90,7 +92,8 @@ services:
retries: 5
start_period: 40s
profiles:
- was-dev
- was
- email-worker
- default

volumes:
Expand Down
6 changes: 0 additions & 6 deletions docker-compose/docker-compose.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -78,10 +76,6 @@ services:
networks:
- Denamu
depends_on:
mysql-db:
condition: service_healthy
redis:
condition: service_healthy
rabbitmq:
condition: service_healthy
volumes:
Expand Down
6 changes: 0 additions & 6 deletions docker-compose/docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -55,10 +53,6 @@ services:
networks:
- Denamu
depends_on:
mysql-db:
condition: service_healthy
redis:
condition: service_healthy
rabbitmq:
condition: service_healthy
volumes:
Expand Down
8 changes: 2 additions & 6 deletions email-worker/docker/Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
6 changes: 2 additions & 4 deletions email-worker/docker/Dockerfile.local
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM node:22-alpine AS builder

WORKDIR /var/web05-Denamu/email-worker

COPY .. .
COPY . .

RUN npm ci

Expand All @@ -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"]
5 changes: 5 additions & 0 deletions email-worker/docker/Dockerfile.prod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 7 additions & 0 deletions email-worker/nodemon.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"watch": ["src"],
"ext": "ts,json",
"exec": "ts-node -r tsconfig-paths/register src/main.ts",
"legacyWatch": true,
"delay": 1000
}
97 changes: 97 additions & 0 deletions email-worker/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 8 additions & 7 deletions email-worker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"eslint": "^9.39.2",
"eslint-config-prettier": "^10.1.8",
"jest": "^29.5.0",
"nodemon": "^3.1.11",
"testcontainers": "^10.25.0",
"ts-jest": "^29.1.0",
"ts-node": "^10.9.2",
Expand All @@ -33,12 +34,12 @@
"lint:fix": "eslint . --fix",
"build": "tsc --project tsconfig.build.json && tsc-alias",
"start": "node dist/src/main.js",
"start:dev": "ts-node -r tsconfig-paths/register src/main.ts",
"test": "cross-env NODE_ENV=test jest --config test/config/unit/jest/jest.config.ts",
"test:cov": "cross-env NODE_ENV=test jest --coverage --config test/config/unit/jest/jest.config.ts",
"test:unit": "cross-env NODE_ENV=test jest --config test/config/unit/jest/jest.config.ts",
"test:unit:cov": "cross-env NODE_ENV=test jest --coverage --config test/config/unit/jest/jest.config.ts",
"test:e2e": "cross-env NODE_ENV=test jest --config test/config/unit/jest/jest.config.ts",
"test:e2e:cov": "cross-env NODE_ENV=test jest --coverage --config test/config/unit/jest/jest.config.ts"
"start:dev": "nodemon",
"test": "cross-env NODE_ENV=TEST jest --config test/config/unit/jest/jest.config.ts",
"test:cov": "cross-env NODE_ENV=TEST jest --coverage --config test/config/unit/jest/jest.config.ts",
"test:unit": "cross-env NODE_ENV=TEST jest --config test/config/unit/jest/jest.config.ts",
"test:unit:cov": "cross-env NODE_ENV=TEST jest --coverage --config test/config/unit/jest/jest.config.ts",
"test:e2e": "cross-env NODE_ENV=TEST jest --config test/config/unit/jest/jest.config.ts",
"test:e2e:cov": "cross-env NODE_ENV=TEST jest --coverage --config test/config/unit/jest/jest.config.ts"
}
}
Loading