Merge branch 'dev' into mpflanzer-allauth

This commit is contained in:
shamoon
2024-02-08 08:08:56 -08:00
committed by GitHub
5 changed files with 151 additions and 147 deletions

View File

@@ -39,8 +39,6 @@ RUN set -eux \
# - Don't leave anything extra in here # - Don't leave anything extra in here
FROM docker.io/python:3.11-slim-bookworm as main-app FROM docker.io/python:3.11-slim-bookworm as main-app
ENV PYTHONWARNINGS="ignore:::django.http.response:517"
LABEL org.opencontainers.image.authors="paperless-ngx team <hello@paperless-ngx.com>" LABEL org.opencontainers.image.authors="paperless-ngx team <hello@paperless-ngx.com>"
LABEL org.opencontainers.image.documentation="https://docs.paperless-ngx.com/" LABEL org.opencontainers.image.documentation="https://docs.paperless-ngx.com/"
LABEL org.opencontainers.image.source="https://github.com/paperless-ngx/paperless-ngx" LABEL org.opencontainers.image.source="https://github.com/paperless-ngx/paperless-ngx"
@@ -57,6 +55,12 @@ ARG JBIG2ENC_VERSION=0.29
ARG QPDF_VERSION=11.6.4 ARG QPDF_VERSION=11.6.4
ARG GS_VERSION=10.02.1 ARG GS_VERSION=10.02.1
# Set Python environment variables
ENV PYTHONDONTWRITEBYTECODE=1 \
PYTHONUNBUFFERED=1 \
# Ignore warning from Whitenoise
PYTHONWARNINGS="ignore:::django.http.response:517"
# #
# Begin installation and configuration # Begin installation and configuration
# Order the steps below from least often changed to most # Order the steps below from least often changed to most