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
3 changes: 2 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ info.log
db.sqlite3
.github
Dockerfile
logs
logs
nginx.conf
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ db.sqlite3
*.dir
# 로그파일 무시
*.log
/logs
/logs
nginx.conf
24 changes: 18 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ services:
- app_network

migrations:
image: ytk030305/alpha_be:1.0.5
image: ytk030305/alpha_be:1.0.8
command: sh entrypoint.sh
depends_on:
- db
Expand All @@ -62,10 +62,10 @@ services:
- app_network

conever_api: # api 컨테이너
image: ytk030305/alpha_be:1.0.5
image: ytk030305/alpha_be:1.0.8
command: daphne -b 0.0.0.0 -p 8000 config.asgi:application
ports:
- "8000:8000"
# ports:
# - "8000:8000"
# volumes:
# - .:/code
depends_on:
Expand All @@ -80,6 +80,18 @@ services:
volumes:
- log_volume:/code/logs

nginx:
image: nginx:latest
container_name: nginx
ports:
- "8000:80" # 외부 접근 포트
volumes:
- ./nginx.conf:/etc/nginx/nginx.conf:ro
depends_on:
- conever_api
networks:
- app_network

# 아래부터는 로깅 컨테이너
# 아래는 promtail 설정
promtail:
Expand All @@ -97,8 +109,8 @@ services:
loki:
image: grafana/loki:2.9.2
restart: always
ports:
- "3100:3100"
# ports:
# - "3100:3100"
command: -config.file=/etc/loki/local-config.yaml
volumes:
- ./loki-config.yaml:/etc/loki/local-config.yaml
Expand Down