From 8cea4a1ed968ff110fed3bef1d6fc980325348aa Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 23 Apr 2025 19:37:15 +0200 Subject: [PATCH] push to 2.15.3 --- Containerfile | 9 ++++++++- rootfs/bin/db-migration | 2 +- rootfs/etc/s6-overlay/s6-rc.d/webserver/run | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Containerfile b/Containerfile index 9489ed6..d46f3c0 100644 --- a/Containerfile +++ b/Containerfile @@ -12,7 +12,9 @@ RUN apk add --no-cache \ cmake \ openblas-dev \ libffi-dev \ - linux-headers + linux-headers \ + grep \ + findutils ENV VERSION=v2.15.3 ENV ARCHIVE=paperless-ngx-$VERSION.tar.xz @@ -31,6 +33,7 @@ RUN sed '/os\.makedirs(LOGGING_DIR, exist_ok=True)/d' -i src/paperless/settings. RUN python3 -m venv env RUN env/bin/pip3 install -r requirements.txt +RUN find /install -type f -exec grep -lZ "^#!/install/env/bin/python3" {} + | xargs -0 -I {} sed -i "1s|^#!/install/env/bin/python3|#!/var/lib/paperless/env/bin/python|" {} FROM docker.io/thallian/alpine-s6:3.21-3.2.0.2 @@ -67,5 +70,9 @@ RUN chown -R paperless:paperless /var/lib/paperless ENV HOME /var/lib/paperless ENV S6_CMD_WAIT_FOR_SERVICES_MAXTIME=20000 +ENV GRANIAN_HOST=:: +ENV GRANIAN_PORT=8000 +ENV GRANIAN_WORKERS=1 + VOLUME ["/var/lib/paperless/media", "/var/lib/paperless/consume", "/var/lib/paperless/data"] EXPOSE 8000 diff --git a/rootfs/bin/db-migration b/rootfs/bin/db-migration index bba020d..69836bd 100755 --- a/rootfs/bin/db-migration +++ b/rootfs/bin/db-migration @@ -1,2 +1,2 @@ #!/bin/sh -s6-setuidgid paperless ~/env/bin/python3 ~/src/manage.py migrate +s6-setuidgid paperless ~/env/bin/python3 ~/src/manage.py migrate --skip-checks --no-input diff --git a/rootfs/etc/s6-overlay/s6-rc.d/webserver/run b/rootfs/etc/s6-overlay/s6-rc.d/webserver/run index 132cb9c..0afba3f 100644 --- a/rootfs/etc/s6-overlay/s6-rc.d/webserver/run +++ b/rootfs/etc/s6-overlay/s6-rc.d/webserver/run @@ -1,4 +1,4 @@ #!/bin/sh cd /var/lib/paperless/src || exit -s6-setuidgid paperless ~/env/bin/python3 ~/env/bin/gunicorn -c ~/gunicorn.conf.py paperless.asgi:application +s6-setuidgid paperless ~/env/bin/python3 ~/env/bin/granian --interface asginl --ws --loop uvloop "paperless.asgi:application"