diff --git a/.gitignore b/.gitignore index d8d64113..6abcd028 100644 --- a/.gitignore +++ b/.gitignore @@ -1,164 +1,2 @@ -# ---> Python -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -share/python-wheels/ -*.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.nox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -*.py,cover -.hypothesis/ -.pytest_cache/ -cover/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py -db.sqlite3 -db.sqlite3-journal - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -.pybuilder/ -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# IPython -profile_default/ -ipython_config.py - -# pyenv -# For a library or package, you might want to ignore these files since the code is -# intended to run in multiple environments; otherwise, check them in: -# .python-version - -# pipenv -# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. -# However, in case of collaboration, if having platform-specific dependencies or dependencies -# having no cross-platform support, pipenv may install dependencies that don't work, or not -# install all needed dependencies. -#Pipfile.lock - -# poetry -# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. -# This is especially recommended for binary packages to ensure reproducibility, and is more -# commonly ignored for libraries. -# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control -#poetry.lock - -# pdm -# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. -#pdm.lock -# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it -# in version control. -# https://pdm.fming.dev/#use-with-ide -.pdm.toml - -# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm -__pypackages__/ - -# Celery stuff -celerybeat-schedule -celerybeat.pid - -# SageMath parsed files -*.sage.py - -# Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ -.dmypy.json -dmypy.json - -# Pyre type checker -.pyre/ - -# pytype static type analyzer -.pytype/ - -# Cython debug symbols -cython_debug/ - -# PyCharm -# JetBrains specific template is maintained in a separate JetBrains.gitignore that can -# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore -# and can be added to the global gitignore or merged into this file. For a more nuclear -# option (not recommended) you can uncomment the following to ignore the entire idea folder. -.idea/ -app/static/*.css.map -/app/static/media/ -celery_worker.py +.env.docker +.gunicorn.conf.py diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..3f977825 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,20 @@ +# syntax=docker/dockerfile:1.4 +FROM --platform=$BUILDPLATFORM python:3-alpine AS builder + +WORKDIR /app + +RUN apk update +RUN apk add pkgconfig +RUN apk add --virtual build-deps gcc python3-dev musl-dev + +COPY requirements.txt /app +RUN pip3 install -r requirements.txt +RUN pip3 install gunicorn + +COPY . /app +RUN chmod u+x ./entrypoint.sh +RUN chmod u+x ./entrypoint_celery.sh + +ENTRYPOINT ["./entrypoint.sh"] + + diff --git a/celery_worker_local.py b/celery_worker_local.py new file mode 100644 index 00000000..9f559080 --- /dev/null +++ b/celery_worker_local.py @@ -0,0 +1,7 @@ +#!/usr/bin/env python +import os +from app import celery, create_app + + +app = create_app() +app.app_context().push() diff --git a/compose.yaml b/compose.yaml new file mode 100644 index 00000000..2f66927a --- /dev/null +++ b/compose.yaml @@ -0,0 +1,42 @@ +services: + db: + shm_size: 128mb + image: postgres + env_file: + - ./.env.docker + volumes: + - pgdata:/var/lib/postgresql/data + redis: + image: redis + env_file: + - ./.env.docker + celery: + build: + context: . + target: builder + env_file: + - ./.env.docker + entrypoint: ./entrypoint_celery.sh + web: + build: + context: . + target: builder + depends_on: + - db + - redis + env_file: + - ./.env.docker + volumes: + - ./.env:/app/.env + - ./.gunicorn.conf.py:/app/gunicorn.conf.py + ports: + - '8080:5000' + adminer: + image: adminer + restart: always + ports: + - 8888:8080 +volumes: + pgdata: + + diff --git a/entrypoint.sh b/entrypoint.sh new file mode 100644 index 00000000..82501c93 --- /dev/null +++ b/entrypoint.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env sh +flask db upgrade +gunicorn --config gunicorn.conf.py --preload pyfedi:app diff --git a/entrypoint_celery.sh b/entrypoint_celery.sh new file mode 100644 index 00000000..a43a2b41 --- /dev/null +++ b/entrypoint_celery.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +celery multi start -A celery_worker_local.celery worker1