mirror of
https://codeberg.org/rimu/pyfedi
synced 2025-01-23 19:36:56 -08:00
Merge branch 'main' of codeberg.org:saint/pyfedi
This commit is contained in:
commit
9d7a21d2b8
3 changed files with 7 additions and 4 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
@ -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/
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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:
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue