Compare commits

..

No commits in common. "main" and "2.1.3" have entirely different histories.
main ... 2.1.3

3 changed files with 8 additions and 18 deletions

View File

@ -1,4 +1,4 @@
FROM docker.io/alpine:3.21 AS builder FROM docker.io/alpine:3.19 AS builder
RUN apk add --no-cache \ RUN apk add --no-cache \
python3-dev \ python3-dev \
@ -12,13 +12,11 @@ RUN apk add --no-cache \
cmake \ cmake \
openblas-dev \ openblas-dev \
libffi-dev \ libffi-dev \
linux-headers \ linux-headers
grep \
findutils
ENV VERSION=v2.15.3 ENV VERSION=v2.1.3
ENV ARCHIVE=paperless-ngx-$VERSION.tar.xz ENV ARCHIVE=paperless-ngx-$VERSION.tar.xz
ENV SHA256_SUM=20cd5961b1f91bde5cb6743ae8eb7f8fd98d66ba67d49d5ab030d87c998ac2d1 ENV SHA256_SUM=a27fd03806d6ee45c389e89e5074baddb21002c82bcf867fed2d81e36aa83d6e
RUN wget https://github.com/paperless-ngx/paperless-ngx/releases/download/$VERSION/$ARCHIVE RUN wget https://github.com/paperless-ngx/paperless-ngx/releases/download/$VERSION/$ARCHIVE
RUN echo "$SHA256_SUM $ARCHIVE" | sha256sum -c - || exit 1 RUN echo "$SHA256_SUM $ARCHIVE" | sha256sum -c - || exit 1
RUN mkdir -p /install RUN mkdir -p /install
@ -32,12 +30,9 @@ RUN sed '/os\.makedirs(LOGGING_DIR, exist_ok=True)/d' -i src/paperless/settings.
RUN python3 -m venv env RUN python3 -m venv env
RUN env/bin/pip3 install -r requirements.txt RUN env/bin/pip3 install -r requirements.txt
RUN env/bin/pip3 uninstall -y psycopg psycopg-binary psycopg-c
RUN env/bin/pip3 install psycopg
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 FROM docker.io/thallian/alpine-s6:3.19-3.1.6.2
RUN addgroup -g 2222 paperless RUN addgroup -g 2222 paperless
RUN adduser -h /var/lib/paperless -u 2222 -D -G paperless paperless RUN adduser -h /var/lib/paperless -u 2222 -D -G paperless paperless
@ -57,8 +52,7 @@ RUN apk add --no-cache \
tesseract-ocr-data-osd \ tesseract-ocr-data-osd \
unpaper \ unpaper \
font-liberation \ font-liberation \
poppler-utils \ poppler-utils
openblas
COPY --from=builder /install /var/lib/paperless COPY --from=builder /install /var/lib/paperless
@ -72,9 +66,5 @@ RUN chown -R paperless:paperless /var/lib/paperless
ENV HOME /var/lib/paperless ENV HOME /var/lib/paperless
ENV S6_CMD_WAIT_FOR_SERVICES_MAXTIME=20000 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"] VOLUME ["/var/lib/paperless/media", "/var/lib/paperless/consume", "/var/lib/paperless/data"]
EXPOSE 8000 EXPOSE 8000

View File

@ -1,2 +1,2 @@
#!/bin/sh #!/bin/sh
s6-setuidgid paperless ~/env/bin/python3 ~/src/manage.py migrate --skip-checks --no-input s6-setuidgid paperless ~/env/bin/python3 ~/src/manage.py migrate

View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
cd /var/lib/paperless/src || exit cd /var/lib/paperless/src || exit
s6-setuidgid paperless ~/env/bin/python3 ~/env/bin/granian --interface asginl --ws --loop uvloop "paperless.asgi:application" s6-setuidgid paperless ~/env/bin/python3 ~/env/bin/gunicorn -c ~/gunicorn.conf.py paperless.asgi:application