This commit is contained in:
Egor Matveev 2022-03-09 00:10:42 +03:00
parent 2507e9ec9e
commit fdd9bce6a4
2 changed files with 24 additions and 10 deletions

View File

@ -3,6 +3,17 @@ version: "3"
services: services:
nginx:
image: nginx
ports:
- "80:80"
volumes:
- ./nginx.conf:/etc/nginx/nginx.conf
deploy:
mode: replicated
restart_policy:
condition: on-failure
postgres: postgres:
image: postgres image: postgres
environment: environment:
@ -25,7 +36,6 @@ services:
depends_on: depends_on:
- postgres - postgres
environment: environment:
PORT: 80
SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions" SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions"
DB_HOST: $DB_HOST DB_HOST: $DB_HOST
DB_PASSWORD: $DB_PASSWORD DB_PASSWORD: $DB_PASSWORD
@ -41,7 +51,6 @@ services:
web: web:
image: mathwave/sprint-repo:sprint image: mathwave/sprint-repo:sprint
environment: environment:
PORT: 80
SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions" SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions"
DB_HOST: $DB_HOST DB_HOST: $DB_HOST
DB_PASSWORD: $DB_PASSWORD DB_PASSWORD: $DB_PASSWORD
@ -49,9 +58,9 @@ services:
FS_HOST: $FS_HOST FS_HOST: $FS_HOST
DEBUG: $DEBUG DEBUG: $DEBUG
TELEGRAM_TOKEN: $TELEGRAM_TOKEN TELEGRAM_TOKEN: $TELEGRAM_TOKEN
command: ./manage.py runserver 0.0.0.0:$PORT --noreload command: ./manage.py runserver 0.0.0.0:8000 --noreload
ports: ports:
- "${PORT}:${PORT}" - "8000:8000"
depends_on: depends_on:
- migrations - migrations
- rabbitmq - rabbitmq
@ -65,7 +74,6 @@ services:
image: mathwave/sprint-repo:sprint image: mathwave/sprint-repo:sprint
command: ./manage.py storage command: ./manage.py storage
environment: environment:
PORT: 80
SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions" SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions"
DB_HOST: $DB_HOST DB_HOST: $DB_HOST
DB_PASSWORD: $DB_PASSWORD DB_PASSWORD: $DB_PASSWORD
@ -85,7 +93,6 @@ services:
bot: bot:
image: mathwave/sprint-repo:sprint image: mathwave/sprint-repo:sprint
environment: environment:
PORT: 80
SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions" SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions"
DB_HOST: $DB_HOST DB_HOST: $DB_HOST
DB_PASSWORD: $DB_PASSWORD DB_PASSWORD: $DB_PASSWORD
@ -104,7 +111,6 @@ services:
loop: loop:
image: mathwave/sprint-repo:sprint image: mathwave/sprint-repo:sprint
environment: environment:
PORT: 80
SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions" SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions"
DB_HOST: $DB_HOST DB_HOST: $DB_HOST
DB_PASSWORD: $DB_PASSWORD DB_PASSWORD: $DB_PASSWORD
@ -135,7 +141,6 @@ services:
privileged: true privileged: true
command: ./manage.py receive command: ./manage.py receive
environment: environment:
PORT: 80
SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions" SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions"
DB_HOST: $DB_HOST DB_HOST: $DB_HOST
DB_PASSWORD: $DB_PASSWORD DB_PASSWORD: $DB_PASSWORD
@ -161,7 +166,6 @@ services:
image: mathwave/sprint-repo:sprint image: mathwave/sprint-repo:sprint
command: ./manage.py apply_languages command: ./manage.py apply_languages
environment: environment:
PORT: 80
SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions" SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions"
DB_HOST: $DB_HOST DB_HOST: $DB_HOST
DB_PASSWORD: $DB_PASSWORD DB_PASSWORD: $DB_PASSWORD
@ -182,7 +186,6 @@ services:
image: mathwave/sprint-repo:sprint image: mathwave/sprint-repo:sprint
command: ./manage.py success_deploy command: ./manage.py success_deploy
environment: environment:
PORT: 80
SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions" SOLUTIONS_ROOT_EXTERNAL: "/sprint-data/data/solutions"
DB_HOST: $DB_HOST DB_HOST: $DB_HOST
DB_PASSWORD: $DB_PASSWORD DB_PASSWORD: $DB_PASSWORD

11
nginx.conf Normal file
View File

@ -0,0 +1,11 @@
http {
upstream app_server {
server 127.0.0.1:8000 fail_timeout=0;
}
server {
listen 80;
location / {
proxy_pass http://app_server;
}
}
}