Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge current state of development into main #372

Merged
merged 11 commits into from
Sep 30, 2024
3 changes: 0 additions & 3 deletions .github/workflows/client-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ on:
- "Tekst-Web/package-lock.json"
- ".github/workflows/client-build.yml"
pull_request:
branches:
- main
- development
paths:
- "Tekst-Web/public/**"
- "Tekst-Web/scripts/**"
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/server-style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ on:
- "Tekst-API/poetry.lock"
- ".github/workflows/server-style.yml"
pull_request:
branches:
- development
- main
paths:
- "Tekst-API/tekst/**"
- "Tekst-API/tests/**"
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/server-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ on:
- "Tekst-API/poetry.lock"
- ".github/workflows/server-tests.yml"
pull_request:
branches:
- development
- main
paths:
- "Tekst-API/tekst/**"
- "Tekst-API/tests/**"
Expand Down
10 changes: 8 additions & 2 deletions Tekst-API/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@

FROM python:3.10-slim-bullseye AS base

COPY --chmod=0644 <<"EOF" /etc/apt/apt.conf
APT::Get::Assume-Yes "true";
APT::Install-Recommends "0";
APT::Install-Suggests "0";
APT::Sandbox::User "root";
EOF

ENV PYTHONFAULTHANDLER=1 \
PYTHONHASHSEED=random \
PYTHONUNBUFFERED=1 \
Expand Down Expand Up @@ -69,8 +76,7 @@ ENV FASTAPI_ENV=production

# install needed OS packages
RUN apt-get update && \
apt-get install --no-install-recommends -y \
curl && \
apt-get install curl && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

Expand Down
2 changes: 1 addition & 1 deletion Tekst-API/deployment/gunicorn/gunicorn_conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

bind = "0.0.0.0:8000"
preload_app = True
timeout = 480 # this has to be quite long as the workers also generate export data etc.
timeout = 960 # this has to be quite long as the workers also generate export data etc.

workers = int(min(4, multiprocessing.cpu_count() * 2 + 1))
worker_class = "uvicorn.workers.UvicornWorker"
Expand Down
38 changes: 19 additions & 19 deletions Tekst-API/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Tekst-Web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading