michael/pyfedi
1
0
Fork 0
mirror of https://codeberg.org/rimu/pyfedi synced 2025-02-03 00:31:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request 'fixes for Docker and Mail configuration' (#63) from saint/pyfedi:main into main

Browse source 
Reviewed-on: https://codeberg.org/rimu/pyfedi/pulls/63
This commit is contained in:
rimu 2024-02-26 18:21:09 +00:00
commit 3f0799a1c4
5 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -166,3 +166,7 @@ celery_worker.py
# sensitive data # sensitive data
.env.docker .env.docker
.gunicorn.conf.py .gunicorn.conf.py
# local volumes for docker
media/
pgdata/

2
Dockerfile
View file

@ -4,7 +4,7 @@ FROM --platform=$BUILDPLATFORM python:3-alpine AS builder
RUN apk update RUN apk update
RUN apk add pkgconfig RUN apk add pkgconfig
RUN apk add --virtual build-deps gcc python3-dev musl-dev RUN apk add --virtual build-deps gcc python3-dev musl-dev tesseract-ocr tesseract-ocr-data-eng
WORKDIR /app WORKDIR /app
COPY . /app COPY . /app

2
app/__init__.py
View file

@ -97,7 +97,7 @@ def create_app(config_class=Config):
secure = () secure = ()
mail_handler = SMTPHandler( mail_handler = SMTPHandler(
mailhost=(app.config['MAIL_SERVER'], app.config['MAIL_PORT']), mailhost=(app.config['MAIL_SERVER'], app.config['MAIL_PORT']),
fromaddr='errors@rimu.geek.nz', fromaddr=(app.config['MAIL_FROM']),
toaddrs=app.config['ADMINS'], subject='PieFed error', toaddrs=app.config['ADMINS'], subject='PieFed error',
credentials=auth, secure=secure) credentials=auth, secure=secure)
mail_handler.setLevel(logging.ERROR) mail_handler.setLevel(logging.ERROR)

5
compose.yaml
View file

@ -5,7 +5,7 @@ services:
env_file: env_file:
- ./.env.docker - ./.env.docker
volumes: volumes:
- pgdata:/var/lib/postgresql/data - ./pgdata:/var/lib/postgresql/data
redis: redis:
image: redis image: redis
env_file: env_file:
@ -29,6 +29,7 @@ services:
volumes: volumes:
- ./.env:/app/.env - ./.env:/app/.env
- ./.gunicorn.conf.py:/app/gunicorn.conf.py - ./.gunicorn.conf.py:/app/gunicorn.conf.py
- ./media/:/app/app/static/media/
ports: ports:
- '8080:5000' - '8080:5000'
adminer: adminer:
@ -36,7 +37,5 @@ services:
restart: always restart: always
ports: ports:
- 8888:8080 - 8888:8080
volumes:
pgdata:

2
config.py
View file

@ -16,6 +16,8 @@ class Config(object):
MAIL_USE_TLS = os.environ.get('MAIL_USE_TLS') is not None MAIL_USE_TLS = os.environ.get('MAIL_USE_TLS') is not None
MAIL_USERNAME = os.environ.get('MAIL_USERNAME') MAIL_USERNAME = os.environ.get('MAIL_USERNAME')
MAIL_PASSWORD = os.environ.get('MAIL_PASSWORD') MAIL_PASSWORD = os.environ.get('MAIL_PASSWORD')
MAIL_FROM = os.environ.get('MAIL_FROM')
ADMINS = os.environ.get('ADMINS')
RECAPTCHA_PUBLIC_KEY = os.environ.get("RECAPTCHA_PUBLIC_KEY") RECAPTCHA_PUBLIC_KEY = os.environ.get("RECAPTCHA_PUBLIC_KEY")
RECAPTCHA_PRIVATE_KEY = os.environ.get("RECAPTCHA_PRIVATE_KEY") RECAPTCHA_PRIVATE_KEY = os.environ.get("RECAPTCHA_PRIVATE_KEY")
MODE = os.environ.get('MODE') or 'development' MODE = os.environ.get('MODE') or 'development'