TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-22 02:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update joex docker image

Browse Source 
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.
This commit is contained in:
eikek
2022-11-04 19:45:21 +01:00
parent 1a6a18d7b9
commit a5315f44ee
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docker/dockerfiles/joex.dockerfile
View File

@ -1,14 +1,12 @@
FROM alpine:3.14 FROM alpine:3
ARG version= ARG version=
ARG joex_url= ARG joex_url=
ARG UNO_URL=https://raw.githubusercontent.com/unoconv/unoconv/0.9.0/unoconv ARG UNO_URL=https://raw.githubusercontent.com/unoconv/unoconv/0.9.0/unoconv
ARG TARGETPLATFORM ARG TARGETPLATFORM
RUN JDKPKG="openjdk11-jre"; \ RUN apk update && \
if [[ $TARGETPLATFORM = linux/arm* ]]; then JDKPKG="openjdk8-jre"; fi; \ apk add --no-cache openjdk17-jre \
apk update && \
apk add --no-cache $JDKPKG \
tzdata \ tzdata \
bash \ bash \
curl \ curl \
@ -35,7 +33,7 @@ RUN JDKPKG="openjdk11-jre"; \
tesseract-ocr-data-pol \ tesseract-ocr-data-pol \
tesseract-ocr-data-est \ tesseract-ocr-data-est \
unpaper \ unpaper \
wkhtmltopdf \ weasyprint \
libreoffice \ libreoffice \
ttf-droid-nonlatin \ ttf-droid-nonlatin \
ttf-droid \ ttf-droid \
@ -60,7 +58,7 @@ RUN JDKPKG="openjdk11-jre"; \
&& curl -Ls $UNO_URL -o /usr/local/bin/unoconv \ && curl -Ls $UNO_URL -o /usr/local/bin/unoconv \
&& chmod +x /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 \ && 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 WORKDIR /opt
RUN wget ${joex_url:-https://github.com/eikek/docspell/releases/download/v$version/docspell-joex-$version.zip} && \ 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 COPY joex-entrypoint.sh /opt/joex-entrypoint.sh
ENTRYPOINT ["/opt/joex-entrypoint.sh", "-J-XX:+UseG1GC"] ENTRYPOINT ["/opt/joex-entrypoint.sh"]
EXPOSE 7878 EXPOSE 7878
HEALTHCHECK --interval=1m --timeout=10s --retries=2 --start-period=30s \ HEALTHCHECK --interval=1m --timeout=10s --retries=2 --start-period=30s \

4
docker/dockerfiles/restserver.dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.16 FROM alpine:3
ARG version= ARG version=
ARG restserver_url= 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 && \ ln -snf docspell-restserver-* docspell-restserver && \
rm docspell-restserver/conf/docspell-server.conf 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 EXPOSE 7880
HEALTHCHECK --interval=1m --timeout=10s --retries=2 --start-period=30s \ HEALTHCHECK --interval=1m --timeout=10s --retries=2 --start-period=30s \