Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/auto-assign-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ jobs:
? context.payload.pull_request.requested_reviewers.map(r => r.login)
: [];

const BE_reviewers = ['summersummerwhy', 'ezcolin2', 'Tolerblanc'];
const FE_reviewers = ['yewonJin', 'djk01281'];
const doc_reviewers = ['summersummerwhy', 'ezcolin2', 'Tolerblanc', 'yewonJin', 'djk01281'];
const BE_reviewers = ['summersummerwhy', 'ezcolin2'];
const FE_reviewers = ['baegyeong', 'pkh0106'];
const doc_reviewers = ['summersummerwhy', 'ezcolin2', 'baegyeong', 'pkh0106'];

// Function to filter out assignees, PR author, and current reviewers
const filterReviewers = (reviewers) => {
Expand Down
4 changes: 4 additions & 0 deletions apps/backend/src/auth/auth.controller.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ describe('AuthController', () => {
refreshAccessToken: jest.fn(() => 'mockedAccessToken'),
},
},
{
provide: JwtAuthGuard,
useValue: {},
},
],
})
.overrideGuard(JwtAuthGuard)
Expand Down
22 changes: 8 additions & 14 deletions compose.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,14 @@ version: "3.8"
services:
postgres:
image: postgres:16-alpine
environment:
POSTGRES_USER: ${DB_USER}
POSTGRES_PASSWORD: ${DB_PASSWORD}
POSTGRES_DB: ${DB_NAME}
env_file:
- .env.local
volumes:
- postgres_data:/var/lib/postgresql/data
networks:
- net
healthcheck:
test: ["CMD-SHELL", "pg_isready -U ${DB_USER} -d ${DB_NAME}"]
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
interval: 10s
timeout: 5s
retries: 5
Expand All @@ -21,9 +19,8 @@ services:

redis:
image: redis:latest
environment:
REDIS_HOST: ${REDIS_HOST}
REDIS_PORT: ${REDIS_PORT}
env_file:
- .env.local
networks:
- net
ports:
Expand All @@ -40,9 +37,8 @@ services:
dockerfile: ./services/frontend/Dockerfile.local
image: frontend:latest
env_file:
- .env
- .env.local
volumes:
- .env:/app/.env
- ./apps/frontend:/app/apps/frontend

networks:
Expand All @@ -56,9 +52,8 @@ services:
dockerfile: ./services/backend/Dockerfile.local
image: backend:latest
env_file:
- .env
- .env.local
volumes:
- .env:/app/.env
- ./apps/backend:/app/apps/backend
depends_on:
postgres:
Expand All @@ -76,9 +71,8 @@ services:
dockerfile: ./services/websocket/Dockerfile.local
image: websocket:latest
env_file:
- .env
- .env.local
volumes:
- .env:/app/.env
- ./apps/websocket:/app/apps/websocket
depends_on:
postgres:
Expand Down
15 changes: 8 additions & 7 deletions compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ version: "3.8"
services:
nginx:
image: summersummerwhy/octodocs-nginx:latest
env_file:
- .env.server
restart: always
ports:
- "80:80"
Expand All @@ -20,8 +22,8 @@ services:

backend:
image: summersummerwhy/octodocs-backend:latest
volumes:
- ./.env.server:/app/apps/backend/.env
env_file:
- .env.server
expose:
- "3000"
networks:
Expand All @@ -48,8 +50,8 @@ services:

websocket:
image: summersummerwhy/octodocs-websocket:latest
volumes:
- ./.env.server:/app/apps/websocket/.env
env_file:
- .env.server
expose:
- "4242"
networks:
Expand Down Expand Up @@ -78,9 +80,8 @@ services:

redis:
image: redis:latest
environment:
REDIS_HOST: ${REDIS_HOST}
REDIS_PORT: ${REDIS_PORT}
env_file:
- .env.server
networks:
- backend
- frontend
Expand Down
Loading