aykhans/series-robot-web
1
0
Fork 0
mirror of https://github.com/aykhans/series-robot-web.git synced 2025-04-16 04:53:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug fixed

Browse Source
This commit is contained in:
Ubuntu 2023-01-31 17:53:42 +00:00
parent ee6b5e51c1
commit 5b51d7dfef
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Docker/Prod/docker-compose-cloudflare.yml
View File

@ -6,7 +6,7 @@ services:
volumes:
- dbdata:/var/lib/postgresql/data
env_file:
- config/db/databasepostgresql_env
- ../../config/db/databasepostgresql_env
rabbitmq:
image: rabbitmq
@ -19,8 +19,9 @@ services:
context: ../../
dockerfile: Docker/Prod/Dockerfile
command: >
bash -c "python3 src/manage.py makemigrations
bash -c "python3 src/manage.py makemigrations
&& python3 src/manage.py migrate
&& python3 src/manage.py collectstatic --noinput
&& gunicorn --chdir src --bind 0.0.0.0:8000 config.wsgi"
ports:
- "8000:8000"
@ -35,7 +36,7 @@ services:
ports:
- "80:80"
volumes:
- ./config/nginx/server-cloudflare.conf:/etc/nginx/conf.d/default.conf:ro
- ../../config/nginx/server-cloudflare.conf:/etc/nginx/conf.d/default.conf:ro
- static_volume:/django_static
depends_on:
- django

15
Docker/Prod/docker-compose.yml
View File

@ -6,7 +6,7 @@ services:
volumes:
- dbdata:/var/lib/postgresql/data
env_file:
- config/db/databasepostgresql_env
- ../../config/db/databasepostgresql_env
rabbitmq:
image: rabbitmq
@ -19,8 +19,9 @@ services:
context: ../../
dockerfile: Docker/Prod/Dockerfile
command: >
bash -c "python3 src/manage.py makemigrations
bash -c "python3 src/manage.py makemigrations
&& python3 src/manage.py migrate
&& python3 src/manage.py collectstatic --noinput
&& gunicorn --chdir src --bind 0.0.0.0:8000 config.wsgi"
ports:
- "8000:8000"
@ -36,9 +37,9 @@ services:
- "80:80"
- "443:443"
volumes:
- ./config/nginx/server.conf:/etc/nginx/conf.d/default.conf:ro
- ./config/certbot/conf:/etc/letsencrypt
- ./config/certbot/www:/var/www/certbot
- ../../config/nginx/server.conf:/etc/nginx/conf.d/default.conf:ro
- ../../config/certbot/conf:/etc/letsencrypt
- ../../config/certbot/www:/var/www/certbot
- static_volume:/django_static
depends_on:
- django
@ -47,8 +48,8 @@ services:
certbot:
image: certbot/certbot
volumes:
- ./config/certbot/conf:/etc/letsencrypt
- ./config/certbot/www:/var/www/certbot
- ../../config/certbot/conf:/etc/letsencrypt
- ../../config/certbot/www:/var/www/certbot
entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'"
volumes: