From 3d074c5fc98fd90266cf9d350c774719a6f1f535 Mon Sep 17 00:00:00 2001
From: Malte <git@jacobsen.online>
Date: Tue, 27 Oct 2020 12:37:37 +0100
Subject: [PATCH] Bugfixes - Using a script in `/usr/local/bin ` now to
 overwrit the default *ocrmypdf* version and thus replaced the approach using
 a bash function - Also had to add volume mapping to docker call

**ATTENTION** the path /tmp/docspell-convert:/tmp/docspell-convert must be mapped when starting Docspell's docker image!
---
 docker/joex-entrypoint.sh | 15 +++++++++------
 docker/joex-ocrmypdf.sh   |  6 ++++++
 docker/joex.dockerfile    |  1 +
 3 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 docker/joex-ocrmypdf.sh

diff --git a/docker/joex-entrypoint.sh b/docker/joex-entrypoint.sh
index 9bfde864..670d923e 100755
--- a/docker/joex-entrypoint.sh
+++ b/docker/joex-entrypoint.sh
@@ -5,13 +5,16 @@ unoconv -l &
 
 # replace own ocrmypdf with official dockerfile, i.e. newer version
 if [ -S "/var/run/docker.sock" ]; then
-  echo "Found 'docker.sock': Installing Docker and redirecting 'ocrmypdf' command to official dockerfile by jbarlow83"
-  apk --no-cache add docker
+  if [ ! -f "/usr/local/bin/ocrmypdf.sh" ]; then
+    echo "Found 'docker.sock': Installing Docker and redirecting 'ocrmypdf' command to official dockerfile by jbarlow83"
+    apk --no-cache add docker
+
+    mv /usr/local/bin/joex-ocrmypdf.sh /usr/local/bin/ocrmypdf
+    chmod ug+x /usr/local/bin/ocrmypdf
+  fi
+
   docker pull -q jbarlow83/ocrmypdf:$OCRMYPDF_VERSION
-  function ocrmypdf () {
-    docker run jbarlow83/ocrmypdf:$OCRMYPDF_VERSION $@
-  }
-  echo "Using OCRmyPDF v$(ocrmypdf --version)" && echo
+  echo "Using OCRmyPDF@Docker v$(ocrmypdf --version)" && echo
 fi
 
 /opt/docspell-joex/bin/docspell-joex "$@"
diff --git a/docker/joex-ocrmypdf.sh b/docker/joex-ocrmypdf.sh
new file mode 100644
index 00000000..cce97a98
--- /dev/null
+++ b/docker/joex-ocrmypdf.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ ! "$1" == "--version" ]; then
+  echo "Using docker image for ocrmypdf (Version: $OCRMYPDF_VERSION)"
+fi
+docker run -v '/tmp/docspell-convert:/tmp/docspell-convert' -e "TZ=$TZ" jbarlow83/ocrmypdf:$OCRMYPDF_VERSION $@
diff --git a/docker/joex.dockerfile b/docker/joex.dockerfile
index 16c04226..5feff808 100644
--- a/docker/joex.dockerfile
+++ b/docker/joex.dockerfile
@@ -13,6 +13,7 @@ ENV OCRMYPDF_VERSION=v11.2.1
 
 COPY --from=docspell-base-binaries /opt/docspell-joex /opt/docspell-joex
 COPY joex-entrypoint.sh /opt/joex-entrypoint.sh
+COPY joex-ocrmypdf.sh /usr/local/bin/joex-ocrmypdf.sh
 
 ENTRYPOINT ["/opt/joex-entrypoint.sh"]
 CMD ["/opt/docspell.conf"]