Merge branch 'main' of codeberg.org:saint/pyfedi

This commit is contained in:
Martynas Sklizmantas 2024-02-26 12:09:30 +01:00
commit 9d7a21d2b8
3 changed files with 7 additions and 4 deletions

4
.gitignore vendored
View file

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

View file

@ -4,7 +4,7 @@ FROM --platform=$BUILDPLATFORM python:3-alpine AS builder
RUN apk update
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
COPY . /app

View file

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