From db23ced6c509dd43dee7fe94ec459ed05fafaa13 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Tue, 7 Jan 2020 09:32:51 -0800 Subject: [PATCH] Rename container scripts to document-to-pixels and pixels-to-pdf, and add tesseract dependency --- dangerzone/tasks.py | 4 ++-- share/container/Containerfile | 6 +++--- share/container/{convert_to_pixels => document-to-pixels} | 0 share/container/{convert_to_pdf => pixels-to-pdf} | 0 4 files changed, 5 insertions(+), 5 deletions(-) rename share/container/{convert_to_pixels => document-to-pixels} (100%) rename share/container/{convert_to_pdf => pixels-to-pdf} (100%) diff --git a/dangerzone/tasks.py b/dangerzone/tasks.py index 44d4a58..31ba048 100644 --- a/dangerzone/tasks.py +++ b/dangerzone/tasks.py @@ -91,7 +91,7 @@ class ConvertToPixels(TaskBase): "-v", f"{self.common.pixel_dir.name}:/dangerzone", "dangerzone", - "convert_to_pixels", + "document-to-pixels", ] output = self.execute_podman(args) @@ -171,7 +171,7 @@ class ConvertToPDF(TaskBase): "-v", f"{self.common.safe_dir.name}:/safezone", "dangerzone", - "convert_to_pdf", + "pixels-to-pdf", ] self.execute_podman(args) self.task_finished.emit() diff --git a/share/container/Containerfile b/share/container/Containerfile index 411d269..ecccfbb 100644 --- a/share/container/Containerfile +++ b/share/container/Containerfile @@ -1,10 +1,10 @@ FROM ubuntu:18.04 RUN apt-get update && \ - apt-get install -y file poppler-utils imagemagick ghostscript + apt-get install -y file poppler-utils imagemagick ghostscript tesseract-ocr tesseract-ocr-all # Fix imagemagick policy to allow writing PDFs RUN sed -i '/rights="none" pattern="PDF"/c\' /etc/ImageMagick-6/policy.xml -COPY convert_to_pixels /usr/local/bin/convert_to_pixels -COPY convert_to_pdf /usr/local/bin/convert_to_pdf +COPY document-to-pixels /usr/local/bin/document-to-pixels +COPY pixels-to-pdf /usr/local/bin/pixels-to-pdf diff --git a/share/container/convert_to_pixels b/share/container/document-to-pixels similarity index 100% rename from share/container/convert_to_pixels rename to share/container/document-to-pixels diff --git a/share/container/convert_to_pdf b/share/container/pixels-to-pdf similarity index 100% rename from share/container/convert_to_pdf rename to share/container/pixels-to-pdf