diff --git a/Dockerfile b/Dockerfile index 3d8780bc4..a042ae0cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -73,8 +73,8 @@ 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 && \ - pip install --upgrade pip && \ - pip install --no-cache-dir --upgrade unoserver weasyprint && \ + /opt/venv/bin/pip install --upgrade pip && \ + /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/ && \ ln -s /usr/lib/libreoffice/program /opt/venv/lib/python3.12/site-packages/LibreOffice && \ diff --git a/Dockerfile.fat b/Dockerfile.fat index 738ab87d8..cb02a1cd0 100644 --- a/Dockerfile.fat +++ b/Dockerfile.fat @@ -83,8 +83,8 @@ 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 && \ - pip install --upgrade pip && \ - pip install --no-cache-dir --upgrade unoserver weasyprint && \ + /opt/venv/bin/pip install --upgrade pip && \ + /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/ && \ ln -s /usr/lib/libreoffice/program /opt/venv/lib/python3.12/site-packages/LibreOffice && \ diff --git a/exampleYmlFiles/test_cicd.yml b/exampleYmlFiles/test_cicd.yml index cc490c71f..eebb50f2a 100644 --- a/exampleYmlFiles/test_cicd.yml +++ b/exampleYmlFiles/test_cicd.yml @@ -1,7 +1,7 @@ services: stirling-pdf: container_name: Stirling-PDF-Security-Fat-with-login - image: stirlingtools/stirling-pdf:latest-fat + image: docker.stirlingpdf.com/stirlingtools/stirling-pdf:latest-fat deploy: resources: limits: diff --git a/src/main/java/stirling/software/SPDF/controller/api/MergeController.java b/src/main/java/stirling/software/SPDF/controller/api/MergeController.java index 473411f18..22815b73e 100644 --- a/src/main/java/stirling/software/SPDF/controller/api/MergeController.java +++ b/src/main/java/stirling/software/SPDF/controller/api/MergeController.java @@ -147,10 +147,10 @@ public class MergeController { filesToDelete.add(tempFile); // Add temp file to the list for later deletion mergerUtility.addSource(tempFile); // Add source file to the merger utility } - + mergedTempFile = Files.createTempFile("merged-", ".pdf").toFile(); mergerUtility.setDestinationFileName(mergedTempFile.getAbsolutePath()); - + mergerUtility.mergeDocuments( pdfDocumentFactory.getStreamCacheFunction(totalSize)); // Merge the documents @@ -189,14 +189,14 @@ public class MergeController { log.error("Error in merge pdf process", ex); throw ex; } finally { - if (mergedDocument != null) { + if (mergedDocument != null) { mergedDocument.close(); // Close the merged document } for (File file : filesToDelete) { if (file != null) { Files.deleteIfExists(file.toPath()); // Delete temporary files } - } + } if (mergedTempFile != null) { Files.deleteIfExists(mergedTempFile.toPath()); }