This commit is contained in:
2
Makefile
2
Makefile
@@ -1,6 +1,6 @@
|
|||||||
prod:
|
prod:
|
||||||
docker compose down
|
docker compose down
|
||||||
docker compose -f compose.yaml up --build
|
docker compose -f ./compose.yaml -f ./compose.prod.yaml up --build
|
||||||
|
|
||||||
dev:
|
dev:
|
||||||
docker compose down
|
docker compose down
|
||||||
|
|||||||
@@ -3,4 +3,9 @@ services:
|
|||||||
command: gunicorn -b 0.0.0.0:8000 website.wsgi:application
|
command: gunicorn -b 0.0.0.0:8000 website.wsgi:application
|
||||||
volumes:
|
volumes:
|
||||||
- ./src:/src
|
- ./src:/src
|
||||||
|
env_file:
|
||||||
|
- path: .env.template
|
||||||
|
required: true
|
||||||
|
- path: .env
|
||||||
|
required: false
|
||||||
|
|
||||||
|
|||||||
5
compose.prod.yaml
Normal file
5
compose.prod.yaml
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
services:
|
||||||
|
web:
|
||||||
|
env_file:
|
||||||
|
- path: .env
|
||||||
|
required: true
|
||||||
@@ -1,12 +1,8 @@
|
|||||||
services:
|
services:
|
||||||
web:
|
web:
|
||||||
env_file:
|
|
||||||
- .env.template
|
|
||||||
command: python -Wa manage.py test --noinput --parallel
|
command: python -Wa manage.py test --noinput --parallel
|
||||||
restart: "no"
|
restart: "no"
|
||||||
|
env_file:
|
||||||
db:
|
- path: .env.template
|
||||||
env_file:
|
required: true
|
||||||
- .env.template
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ services:
|
|||||||
PYTHONDONTWRITEBYTECODE: 1
|
PYTHONDONTWRITEBYTECODE: 1
|
||||||
PYTHONUNBUFFERED: 1
|
PYTHONUNBUFFERED: 1
|
||||||
DJANGO_SETTINGS_MODULE: ${DJANGO_SETTINGS_MODULE}
|
DJANGO_SETTINGS_MODULE: ${DJANGO_SETTINGS_MODULE}
|
||||||
env_file: ".env"
|
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
db:
|
db:
|
||||||
@@ -21,7 +20,11 @@ services:
|
|||||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
||||||
volumes:
|
volumes:
|
||||||
- postgres_data:/var/lib/postgresql
|
- postgres_data:/var/lib/postgresql
|
||||||
env_file: ".env"
|
env_file:
|
||||||
|
- path: .env.template
|
||||||
|
required: true
|
||||||
|
- path: .env
|
||||||
|
required: false
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
adminer:
|
adminer:
|
||||||
|
|||||||
Reference in New Issue
Block a user