diff --git a/.dockerignore b/.dockerignore index 5988d44..42a22e6 100644 --- a/.dockerignore +++ b/.dockerignore @@ -5,4 +5,5 @@ info.log db.sqlite3 .github Dockerfile -logs \ No newline at end of file +logs +nginx.conf \ No newline at end of file diff --git a/.gitignore b/.gitignore index ac07a78..47d9c67 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,5 @@ db.sqlite3 *.dir # 로그파일 무시 *.log -/logs \ No newline at end of file +/logs +nginx.conf \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index edc0b97..43f40d8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 @@ -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: @@ -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: @@ -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