Merge pull request #227 from mouse-reeve/prod-deployment

Prod deployment
This commit is contained in:
Mouse Reeve 2020-10-06 12:35:42 -07:00 committed by GitHub
commit 6ef741c651
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 141 additions and 27 deletions

View file

@ -2,7 +2,7 @@ version: '3'
services: services:
nginx: nginx:
build: ./nginx image: nginx:latest
ports: ports:
- 1333:80 - 1333:80
depends_on: depends_on:
@ -10,6 +10,7 @@ services:
networks: networks:
- main - main
volumes: volumes:
- ./nginx:/etc/nginx/conf.d
- static_volume:/app/static - static_volume:/app/static
- media_volume:/app/images - media_volume:/app/images
db: db:

View file

@ -1,4 +0,0 @@
FROM nginx:1.17.4-alpine
RUN rm /etc/nginx/conf.d/default.conf
COPY nginx.conf /etc/nginx/conf.d

65
nginx/default.conf Normal file
View file

@ -0,0 +1,65 @@
upstream web {
server web:8000;
}
server {
listen 80;
location / {
proxy_pass http://web;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $host;
proxy_redirect off;
}
location /images/ {
alias /app/images/;
}
location /static/ {
alias /app/static/;
}
}
# PROD version
#
#server {
# listen [::]:80;
# listen 80;
#
# server_name your-domain.com www.your-domain.com;
#
# location ~ /.well-known/acme-challenge {
# allow all;
# root /var/www/certbot;
# }
#
# # redirect http to https www
# return 301 https://www.your-domain.com$request_uri;
#}
#
#server {
# listen [::]:443 ssl http2;
# listen 443 ssl http2;
#
# server_name your-domain.com;
#
# # SSL code
# ssl_certificate /etc/nginx/ssl/live/your-domain.com/fullchain.pem;
# ssl_certificate_key /etc/nginx/ssl/live/your-domain.com/privkey.pem;
#
# location / {
# proxy_pass http://web;
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# proxy_set_header Host $host;
# proxy_redirect off;
# }
#
# location /images/ {
# alias /app/images/;
# }
#
# location /static/ {
# alias /app/static/;
# }
#}

View file

@ -1,22 +0,0 @@
upstream web {
server web:8000;
}
server {
listen 80;
location / {
proxy_pass http://web;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $host;
proxy_redirect off;
}
location /images/ {
alias /app/images/;
}
location /static/ {
alias /app/static/;
}
}

74
prod-docker-compose.yml Normal file
View file

@ -0,0 +1,74 @@
version: '3'
services:
nginx:
image: nginx:latest
ports:
- 80:80
- 443:443
depends_on:
- web
networks:
- main
volumes:
- ./nginx:/etc/nginx/conf.d
- ./certbot/conf:/etc/nginx/ssl
- ./certbot/data:/var/www/certbot
- static_volume:/app/static
- media_volume:/app/images
certbot:
image: certbot/certbot:latest
command: certonly --webroot --webroot-path=/var/www/certbot --email your-email@domain.com --agree-tos --no-eff-email -d your-domain.com -d www.your-domain.com
volumes:
- ./certbot/conf:/etc/letsencrypt
- ./certbot/logs:/var/log/letsencrypt
- ./certbot/data:/var/www/certbot
db:
image: postgres
env_file: .env
volumes:
- pgdata:/var/lib/postgresql/data
networks:
- main
web:
build: .
command: python manage.py runserver 0.0.0.0:8000
volumes:
- .:/app
- static_volume:/app/static
- media_volume:/app/images
depends_on:
- db
- celery_worker
networks:
- main
ports:
- 8000:8000
redis:
image: redis
env_file: .env
ports:
- "6379:6379"
networks:
- main
restart: on-failure
celery_worker:
env_file: .env
build: .
networks:
- main
command: celery -A celerywyrm worker -l info
volumes:
- .:/app
- static_volume:/app/static
- media_volume:/app/images
depends_on:
- db
- redis
restart: on-failure
volumes:
pgdata:
static_volume:
media_volume:
networks:
main: