diff --git a/Dockerfile b/Dockerfile index 6a854f35e..68c50976f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -73,7 +73,7 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a py3-pillow@testing \ py3-pdf2image@testing && \ python3 -m venv /opt/venv && \ - /opt/venv/bin/pip install --upgrade pip && \ + /opt/venv/bin/pip install --upgrade pip setuptools && \ /opt/venv/bin/pip install --no-cache-dir --upgrade unoserver weasyprint && \ ln -s /usr/lib/libreoffice/program/uno.py /opt/venv/lib/python3.12/site-packages/ && \ ln -s /usr/lib/libreoffice/program/unohelper.py /opt/venv/lib/python3.12/site-packages/ && \ diff --git a/Dockerfile.dev b/Dockerfile.dev index dbfdfc89c..37571373e 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -32,6 +32,7 @@ ENV SETUPTOOLS_USE_DISTUTILS=local # Installation der benötigten Python-Pakete RUN python3 -m venv --system-site-packages /opt/venv \ && . /opt/venv/bin/activate \ + && pip install --upgrade pip setuptools \ && pip install --no-cache-dir WeasyPrint pdf2image pillow unoserver opencv-python-headless pre-commit # Füge den venv-Pfad zur globalen PATH-Variable hinzu, damit die Tools verfügbar sind diff --git a/Dockerfile.fat b/Dockerfile.fat index ef19ebde7..6d23809a8 100644 --- a/Dockerfile.fat +++ b/Dockerfile.fat @@ -83,7 +83,7 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a py3-pillow@testing \ py3-pdf2image@testing && \ python3 -m venv /opt/venv && \ - /opt/venv/bin/pip install --upgrade pip && \ + /opt/venv/bin/pip install --upgrade pip setuptools && \ /opt/venv/bin/pip install --no-cache-dir --upgrade unoserver weasyprint && \ ln -s /usr/lib/libreoffice/program/uno.py /opt/venv/lib/python3.12/site-packages/ && \ ln -s /usr/lib/libreoffice/program/unohelper.py /opt/venv/lib/python3.12/site-packages/ && \ diff --git a/build.gradle b/build.gradle index ad82dfabb..e6444c8c8 100644 --- a/build.gradle +++ b/build.gradle @@ -520,6 +520,7 @@ dependencies { exclude group: "org.slf4j", module: "slf4j-simple" exclude group: "org.bouncycastle", module: "bcprov-jdk15on" exclude group: "com.google.code.gson", module: "gson" + exclude group: "commons-io", module: "commons-io" } implementation 'org.apache.pdfbox:jbig2-imageio:3.0.4'