Add production envrionmennt
This commit is contained in:
parent
627816a3cd
commit
65bed425cf
11 changed files with 141 additions and 50 deletions
1
backend/.gitignore
vendored
1
backend/.gitignore
vendored
|
@ -4,3 +4,4 @@ __pycache__
|
||||||
|
|
||||||
resources
|
resources
|
||||||
right_tree/api/data/fixtures/plants.json
|
right_tree/api/data/fixtures/plants.json
|
||||||
|
right_tree/staticfiles
|
|
@ -1,9 +1,5 @@
|
||||||
FROM python:3.8-slim-bullseye
|
FROM python:3.8-slim-bullseye
|
||||||
|
|
||||||
ENV DJANGO_SUPERUSER_USERNAME=admin
|
|
||||||
ENV DJANGO_SUPERUSER_EMAIL=admin@admin.com
|
|
||||||
ENV DJANGO_SUPERUSER_PASSWORD=admin
|
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
RUN apt update && \
|
RUN apt update && \
|
||||||
|
|
|
@ -4,3 +4,4 @@ djangorestframework==3.12.4
|
||||||
django-cors-headers==3.10.0
|
django-cors-headers==3.10.0
|
||||||
openpyxl==3.0.9
|
openpyxl==3.0.9
|
||||||
requests==2.26.0
|
requests==2.26.0
|
||||||
|
gunicorn==20.1.0
|
|
@ -16,17 +16,19 @@ from pathlib import Path
|
||||||
# Build paths inside the project like this: BASE_DIR / 'subdir'.
|
# Build paths inside the project like this: BASE_DIR / 'subdir'.
|
||||||
BASE_DIR = Path(__file__).resolve().parent.parent
|
BASE_DIR = Path(__file__).resolve().parent.parent
|
||||||
|
|
||||||
|
BASE_URL = os.getenv("BASE_URL", "localhost:8000")
|
||||||
|
|
||||||
# Quick-start development settings - unsuitable for production
|
# Quick-start development settings - unsuitable for production
|
||||||
# See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/
|
# See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/
|
||||||
|
|
||||||
# SECURITY WARNING: keep the secret key used in production secret!
|
# SECURITY WARNING: keep the secret key used in production secret!
|
||||||
SECRET_KEY = 'django-insecure-5t05qc2&14xuot4lgs#z0ll9(nn-=3-8yks!u(5ce704t&m_*q'
|
SECRET_KEY = os.getenv("DJANGO_SECRET_KEY", 'django-insecure-5t05qc2&14xuot4lgs#z0ll9(nn-=3-8yks!u(5ce704t&m_*q')
|
||||||
|
|
||||||
# SECURITY WARNING: don't run with debug turned on in production!
|
# SECURITY WARNING: don't run with debug turned on in production!
|
||||||
DEBUG = True
|
DEBUG = os.getenv('DJANGO_DEBUG_MODE', '') != 'False'
|
||||||
|
|
||||||
ALLOWED_HOSTS = []
|
# os.getenv("ALLOWED_HOSTS", "").split(","),
|
||||||
|
ALLOWED_HOSTS = (BASE_URL,)
|
||||||
|
|
||||||
|
|
||||||
# Application definition
|
# Application definition
|
||||||
|
@ -85,9 +87,9 @@ DATABASES = {
|
||||||
'default': {
|
'default': {
|
||||||
'ENGINE': 'django.contrib.gis.db.backends.postgis',
|
'ENGINE': 'django.contrib.gis.db.backends.postgis',
|
||||||
'NAME': 'right_tree',
|
'NAME': 'right_tree',
|
||||||
'USER': 'postgres',
|
'USER': os.getenv("POSTGRES_DB", "postgres"),
|
||||||
'PASSWORD': 'postgres',
|
'PASSWORD': os.getenv("POSTGRES_USER", "postgres"),
|
||||||
'HOST': 'postgres',
|
'HOST': os.getenv("POSTGRES_PASSWORD", "postgres"),
|
||||||
'PORT': 5432,
|
'PORT': 5432,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -129,7 +131,9 @@ USE_TZ = True
|
||||||
# Static files (CSS, JavaScript, Images)
|
# Static files (CSS, JavaScript, Images)
|
||||||
# https://docs.djangoproject.com/en/3.2/howto/static-files/
|
# https://docs.djangoproject.com/en/3.2/howto/static-files/
|
||||||
|
|
||||||
STATIC_URL = '/static/'
|
STATIC_URL = '/staticfiles/'
|
||||||
|
PROJECT_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||||
|
STATIC_ROOT = os.path.join(PROJECT_DIR, 'staticfiles')
|
||||||
|
|
||||||
# Default primary key field type
|
# Default primary key field type
|
||||||
# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field
|
# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field
|
||||||
|
|
|
@ -30,6 +30,6 @@ router.register(r'download/csv', views.CSVDownloadView ,basename='downloadcsv')
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path('admin/', admin.site.urls),
|
path('admin/', admin.site.urls),
|
||||||
path('', include(router.urls)),
|
path('api/', include(router.urls)),
|
||||||
path('api-auth/', include('rest_framework.urls', namespace='rest_framework'))
|
path('api-auth/', include('rest_framework.urls', namespace='rest_framework'))
|
||||||
]
|
]
|
||||||
|
|
11
default.env
11
default.env
|
@ -1,5 +1,12 @@
|
||||||
LINZ_API_KEY=YOUR_API_KEY
|
# POSTGRES CONFIG
|
||||||
POSTGRES_DB=postgres
|
POSTGRES_DB=postgres
|
||||||
POSTGRES_USER=postgres
|
POSTGRES_USER=postgres
|
||||||
POSTGRES_PASSWORD=postgres
|
POSTGRES_PASSWORD=postgres
|
||||||
FRONTEND_BASE_URL=http://localhost:3000
|
|
||||||
|
# DJANGO BACKEND CONFIG
|
||||||
|
LINZ_API_KEY=YOUR_API_KEY
|
||||||
|
FRONTEND_BASE_URL=http://localhost:9000
|
||||||
|
DJANGO_DEBUG_MODE=False
|
||||||
|
DJANGO_SECRET_KEY=YOUR_DJANGO_SECRET_KEY
|
||||||
|
|
||||||
|
BASE_URL=localhost:9000
|
32
dev
32
dev
|
@ -15,27 +15,27 @@ cmd_create_database() {
|
||||||
|
|
||||||
cmd_makemigrations() {
|
cmd_makemigrations() {
|
||||||
echo "Creating database migrations..."
|
echo "Creating database migrations..."
|
||||||
docker-compose exec django-backend python manage.py makemigrations --no-input
|
docker-compose exec backend python manage.py makemigrations --no-input
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd_migrate() {
|
cmd_migrate() {
|
||||||
echo "Running database migrations..."
|
echo "Running database migrations..."
|
||||||
docker-compose exec django-backend python manage.py migrate
|
docker-compose exec backend python manage.py migrate
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd_createsuperuser() {
|
cmd_createsuperuser() {
|
||||||
echo "Loading shapefiles into the database..."
|
echo "Creating django superuser..."
|
||||||
docker-compose exec django-backend python manage.py createsuperuser --noinput
|
docker-compose run backend python manage.py createsuperuser
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd_load_fixtures() {
|
cmd_load_fixtures() {
|
||||||
echo "Loading fixtures..."
|
echo "Loading fixtures..."
|
||||||
docker-compose exec django-backend bash -c "python manage.py loaddata right_tree/api/data/fixtures/*.json"
|
docker-compose exec backend bash -c "python manage.py loaddata right_tree/api/data/fixtures/*.json"
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd_load_shapefiles() {
|
cmd_load_shapefiles() {
|
||||||
echo "Loading shapefiles into the database..."
|
echo "Loading shapefiles into the database..."
|
||||||
docker-compose exec django-backend python manage.py loadshapefiles
|
docker-compose exec backend python manage.py loadshapefiles
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd_create_plant_fixtures() {
|
cmd_create_plant_fixtures() {
|
||||||
|
@ -45,12 +45,12 @@ cmd_create_plant_fixtures() {
|
||||||
|
|
||||||
cmd_reset_plants() {
|
cmd_reset_plants() {
|
||||||
echo "Resetting plants..."
|
echo "Resetting plants..."
|
||||||
docker-compose exec django-backend python manage.py resetplants
|
docker-compose exec backend python manage.py resetplants
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd_load_plant_fixtures() {
|
cmd_load_plant_fixtures() {
|
||||||
echo "Loading plants..."
|
echo "Loading plants..."
|
||||||
docker-compose exec django-backend python manage.py loaddata right_tree/api/data/fixtures/plants.json
|
docker-compose exec backend python manage.py loaddata right_tree/api/data/fixtures/plants.json
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd_load_plants() {
|
cmd_load_plants() {
|
||||||
|
@ -61,16 +61,15 @@ cmd_load_plants() {
|
||||||
|
|
||||||
cmd_load_sites_from_spreadsheet() {
|
cmd_load_sites_from_spreadsheet() {
|
||||||
echo "Loading habitats and zones..."
|
echo "Loading habitats and zones..."
|
||||||
docker-compose exec django-backend python manage.py loadsitedata
|
docker-compose exec backend python manage.py loadsitedata
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd_populate_database() {
|
cmd_populate_database() {
|
||||||
echo "Populating the database..."
|
echo "Populating the database..."
|
||||||
docker-compose up -d django-backend postgres
|
docker-compose up -d backend postgres
|
||||||
|
|
||||||
cmd_makemigrations
|
cmd_makemigrations
|
||||||
cmd_migrate
|
cmd_migrate
|
||||||
cmd_createsuperuser
|
|
||||||
cmd_load_fixtures
|
cmd_load_fixtures
|
||||||
cmd_load_shapefiles
|
cmd_load_shapefiles
|
||||||
cmd_load_plants
|
cmd_load_plants
|
||||||
|
@ -95,7 +94,14 @@ cmd_start() {
|
||||||
docker-compose up
|
docker-compose up
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cmd_create_staticfiles() {
|
||||||
|
docker-compose -f docker-compose.production.yaml build
|
||||||
|
docker-compose run backend python manage.py collectstatic --no-input
|
||||||
|
docker-compose run frontend npm run-script build
|
||||||
|
}
|
||||||
|
|
||||||
cmd_build_production() {
|
cmd_build_production() {
|
||||||
|
cmd_create_staticfiles
|
||||||
docker-compose -f docker-compose.production.yaml build
|
docker-compose -f docker-compose.production.yaml build
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -103,6 +109,10 @@ cmd_start_production() {
|
||||||
docker-compose -f docker-compose.production.yaml up --remove-orphans
|
docker-compose -f docker-compose.production.yaml up --remove-orphans
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cmd_stop_production() {
|
||||||
|
docker-compose -f docker-compose.production.yaml stop --remove-orphans
|
||||||
|
}
|
||||||
|
|
||||||
# Run the command
|
# Run the command
|
||||||
cmd="$1"
|
cmd="$1"
|
||||||
"cmd_$cmd" "$@"
|
"cmd_$cmd" "$@"
|
||||||
|
|
45
docker-compose.production copy.yaml
Normal file
45
docker-compose.production copy.yaml
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
version: "3.8"
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
righttree-postgres-data:
|
||||||
|
name: righttree-postgres-data
|
||||||
|
|
||||||
|
services:
|
||||||
|
backend:
|
||||||
|
restart: unless-stopped
|
||||||
|
build:
|
||||||
|
context: backend
|
||||||
|
dockerfile: Dockerfile
|
||||||
|
container_name: righttree-backend
|
||||||
|
depends_on:
|
||||||
|
- postgres
|
||||||
|
env_file: .env
|
||||||
|
ports:
|
||||||
|
- "8000:8000"
|
||||||
|
command: bash -c "gunicorn --bind 0.0.0.0:8000 right_tree.wsgi"
|
||||||
|
|
||||||
|
frontend:
|
||||||
|
build:
|
||||||
|
context: frontend
|
||||||
|
dockerfile: Dockerfile
|
||||||
|
restart: unless-stopped
|
||||||
|
container_name: righttree-frontend
|
||||||
|
ports:
|
||||||
|
- "3000:3000"
|
||||||
|
working_dir: /app
|
||||||
|
command: sh -c "serve -s build"
|
||||||
|
|
||||||
|
postgres:
|
||||||
|
image: postgis/postgis:13-3.0
|
||||||
|
restart: unless-stopped
|
||||||
|
container_name: postgres
|
||||||
|
volumes:
|
||||||
|
- righttree-postgres-data:/var/lib/postgresql/data
|
||||||
|
- ./create_database.sql:/docker-entrypoint-initdb.d/create_database.sql
|
||||||
|
ports:
|
||||||
|
- "5432:5432"
|
||||||
|
environment:
|
||||||
|
- POSTGRES_DB=${POSTGRES_DB}
|
||||||
|
- POSTGRES_USER=${POSTGRES_USER}
|
||||||
|
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
|
||||||
|
|
|
@ -1,45 +1,43 @@
|
||||||
version: "3.8"
|
version: "3.8"
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
local-postgres-data:
|
righttree-postgres-data:
|
||||||
name: local-postgres-data
|
name: righttree-postgres-data
|
||||||
|
|
||||||
services:
|
services:
|
||||||
django-backend:
|
backend:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
build:
|
build:
|
||||||
context: backend
|
context: backend
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
container_name: righttree-backend
|
container_name: backend
|
||||||
depends_on:
|
depends_on:
|
||||||
- postgres
|
- postgres
|
||||||
volumes:
|
env_file: .env
|
||||||
- ./backend:/app
|
|
||||||
environment:
|
|
||||||
- LINZ_API_KEY=${LINZ_API_KEY}
|
|
||||||
- FRONTEND_BASE_URL=${FRONTEND_BASE_URL}
|
|
||||||
ports:
|
ports:
|
||||||
- "8000:8000"
|
- "8000:8000"
|
||||||
command: bash -c "./manage.py runserver 0.0.0.0:8000"
|
command: bash -c "gunicorn --bind 0.0.0.0:8000 right_tree.wsgi"
|
||||||
|
|
||||||
react-frontend:
|
nginx:
|
||||||
build:
|
container_name: nginx
|
||||||
context: frontend
|
image: nginx
|
||||||
dockerfile: Dockerfile
|
depends_on:
|
||||||
restart: unless-stopped
|
- postgres
|
||||||
container_name: righttree-frontend
|
- backend
|
||||||
|
volumes:
|
||||||
|
- ./nginx.conf:/etc/nginx/nginx.conf
|
||||||
|
- ./backend/right_tree/staticfiles:/etc/nginx/html/staticfiles
|
||||||
|
- ./frontend/build:/etc/nginx/html/build
|
||||||
|
- ./keys:/etc/ssl/private/nginx
|
||||||
ports:
|
ports:
|
||||||
- "3000:3000"
|
- "9000:80"
|
||||||
working_dir: /app
|
|
||||||
command: sh -c "serve -s build"
|
|
||||||
|
|
||||||
|
|
||||||
postgres:
|
postgres:
|
||||||
image: postgis/postgis:13-3.0
|
image: postgis/postgis:13-3.0
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
container_name: postgres
|
container_name: postgres
|
||||||
volumes:
|
volumes:
|
||||||
- local-postgres-data:/var/lib/postgresql/data
|
- righttree-postgres-data:/var/lib/postgresql/data
|
||||||
- ./create_database.sql:/docker-entrypoint-initdb.d/create_database.sql
|
- ./create_database.sql:/docker-entrypoint-initdb.d/create_database.sql
|
||||||
ports:
|
ports:
|
||||||
- "5432:5432"
|
- "5432:5432"
|
||||||
|
|
|
@ -5,7 +5,7 @@ volumes:
|
||||||
name: local-postgres-data
|
name: local-postgres-data
|
||||||
|
|
||||||
services:
|
services:
|
||||||
django-backend:
|
backend:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
build:
|
build:
|
||||||
context: backend
|
context: backend
|
||||||
|
@ -21,7 +21,7 @@ services:
|
||||||
- "8000:8000"
|
- "8000:8000"
|
||||||
command: bash -c "./manage.py runserver 0.0.0.0:8000"
|
command: bash -c "./manage.py runserver 0.0.0.0:8000"
|
||||||
|
|
||||||
react-frontend:
|
frontend:
|
||||||
image: node:16-alpine3.11
|
image: node:16-alpine3.11
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
container_name: righttree-frontend
|
container_name: righttree-frontend
|
||||||
|
|
29
nginx.conf
Normal file
29
nginx.conf
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
http {
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
listen 443 ssl;
|
||||||
|
index index.html;
|
||||||
|
include /etc/nginx/mime.types;
|
||||||
|
proxy_set_header Host $http_host;
|
||||||
|
|
||||||
|
ssl_certificate /etc/ssl/private/nginx/selfsigned.crt;
|
||||||
|
ssl_certificate_key /etc/ssl/private/nginx/selfsigned.key;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
root /etc/nginx/html/build;
|
||||||
|
}
|
||||||
|
|
||||||
|
location /staticfiles {
|
||||||
|
root /etc/nginx/html/;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~* ^/(api|admin) {
|
||||||
|
proxy_pass http://backend:8000;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
events {
|
||||||
|
# configuration of connection processing
|
||||||
|
}
|
Loading…
Reference in a new issue