Merge current state of development into main (#372)

VedaWebProject · Sep 30, 2024 · 00103a4 · 00103a4
2 parents 8fd92b1 + 996e004
commit 00103a4
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 37 deletions.
diff --git a/.github/workflows/client-build.yml b/.github/workflows/client-build.yml
@@ -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/**"

diff --git a/.github/workflows/server-style.yml b/.github/workflows/server-style.yml
@@ -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/**"

diff --git a/.github/workflows/server-tests.yml b/.github/workflows/server-tests.yml
@@ -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/**"

diff --git a/Tekst-API/Dockerfile b/Tekst-API/Dockerfile
@@ -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 \
@@ -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/*
 

diff --git a/Tekst-API/deployment/gunicorn/gunicorn_conf.py b/Tekst-API/deployment/gunicorn/gunicorn_conf.py
@@ -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"

diff --git a/Tekst-API/poetry.lock b/Tekst-API/poetry.lock
diff --git a/Tekst-Web/package-lock.json b/Tekst-Web/package-lock.json