From a5315f44eee335d2dbe0fdd9a6382fea1be29d14 Mon Sep 17 00:00:00 2001
From: eikek <eike.kettner@posteo.de>
Date: Fri, 4 Nov 2022 19:45:21 +0100
Subject: [PATCH] Update joex docker image

Must drop wkhtmltopdf because it is not available anymore in alpine.
Weasyprint is supposed to be a drop-in replacement, doing poorer
outputs in my eyes. There are alternatives like downloading
pre-compiled binaries, but not for all platforms.
---
 docker/dockerfiles/joex.dockerfile       | 14 ++++++--------
 docker/dockerfiles/restserver.dockerfile |  4 ++--
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/docker/dockerfiles/joex.dockerfile b/docker/dockerfiles/joex.dockerfile
index ccb34cbd..5dc385b3 100644
--- a/docker/dockerfiles/joex.dockerfile
+++ b/docker/dockerfiles/joex.dockerfile
@@ -1,14 +1,12 @@
-FROM alpine:3.14
+FROM alpine:3
 
 ARG version=
 ARG joex_url=
 ARG UNO_URL=https://raw.githubusercontent.com/unoconv/unoconv/0.9.0/unoconv
 ARG TARGETPLATFORM
 
-RUN JDKPKG="openjdk11-jre"; \
-    if [[ $TARGETPLATFORM = linux/arm* ]]; then JDKPKG="openjdk8-jre"; fi; \
-    apk update && \
-    apk add --no-cache $JDKPKG \
+RUN apk update && \
+    apk add --no-cache openjdk17-jre \
     tzdata \
     bash \
     curl \
@@ -35,7 +33,7 @@ RUN JDKPKG="openjdk11-jre"; \
     tesseract-ocr-data-pol \
     tesseract-ocr-data-est \
     unpaper \
-    wkhtmltopdf \
+    weasyprint \
     libreoffice \
     ttf-droid-nonlatin \
     ttf-droid \
@@ -60,7 +58,7 @@ RUN JDKPKG="openjdk11-jre"; \
   && curl -Ls $UNO_URL -o /usr/local/bin/unoconv \
   && chmod +x /usr/local/bin/unoconv \
   && apk del libxml2-dev libxslt-dev zlib-dev g++ python3-dev py3-pip libffi-dev qpdf-dev openssl-dev \
-  && ln -s /usr/bin/python3 /usr/bin/python
+  && ln -nfs /usr/bin/python3 /usr/bin/python
 
 WORKDIR /opt
 RUN wget ${joex_url:-https://github.com/eikek/docspell/releases/download/v$version/docspell-joex-$version.zip} && \
@@ -77,7 +75,7 @@ RUN \
 
 COPY joex-entrypoint.sh /opt/joex-entrypoint.sh
 
-ENTRYPOINT ["/opt/joex-entrypoint.sh", "-J-XX:+UseG1GC"]
+ENTRYPOINT ["/opt/joex-entrypoint.sh"]
 EXPOSE 7878
 
 HEALTHCHECK --interval=1m --timeout=10s --retries=2 --start-period=30s \
diff --git a/docker/dockerfiles/restserver.dockerfile b/docker/dockerfiles/restserver.dockerfile
index 01326e7a..038ed494 100644
--- a/docker/dockerfiles/restserver.dockerfile
+++ b/docker/dockerfiles/restserver.dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3
 
 ARG version=
 ARG restserver_url=
@@ -15,7 +15,7 @@ RUN curl -L -O ${restserver_url:-https://github.com/eikek/docspell/releases/down
     ln -snf docspell-restserver-* docspell-restserver && \
     rm docspell-restserver/conf/docspell-server.conf
 
-ENTRYPOINT ["/opt/docspell-restserver/bin/docspell-restserver", "-J-XX:+UseG1GC"]
+ENTRYPOINT ["/opt/docspell-restserver/bin/docspell-restserver"]
 EXPOSE 7880
 
 HEALTHCHECK --interval=1m --timeout=10s --retries=2 --start-period=30s \