Another try fixing the zlib issue in docker images

zlib 1.2.12-r0 is not working with openjdk, it affects the checksum
calculation of the db migrations. It must be at least 1.2.12-r1. For
some reason joex has this newer version, but the restserver image not.
They are installed explicitely now on both images.

That's why the migration is now disabled on rest-server in the
docker-compose file. It is ok if this is run on one server. It can now
happen that on first start joex is migrating the db and the restserver
tries to do things that don't work yet - it is a corner case. This is
removed with the next version.

Refs: #1517
This commit is contained in:
eikek
2022-05-25 23:49:58 +02:00
parent 35d677dfbf
commit 5cd5ba46af
3 changed files with 5 additions and 1 deletions

View File

@ -41,6 +41,8 @@ services:
- DOCSPELL_SERVER_BACKEND_SIGNUP_MODE=open
- DOCSPELL_SERVER_BACKEND_SIGNUP_NEW__INVITE__PASSWORD=
- DOCSPELL_SERVER_BACKEND_ADDONS_ENABLED=false
- DOCSPELL_SERVER_BACKEND_DATABASE__SCHEMA_RUN__FIXUP__MIGRATIONS=false
- DOCSPELL_SERVER_BACKEND_DATABASE__SCHEMA_RUN__MAIN__MIGRATIONS=false
depends_on:
- solr
- db

View File

@ -53,6 +53,7 @@ RUN JDKPKG="openjdk11-jre"; \
qpdf-dev \
openssl-dev \
ocrmypdf \
&& apk add 'zlib=1.2.12-r1' \
&& pip3 install --upgrade pip \
&& pip3 install ocrmypdf \
&& curl -Ls $UNO_URL -o /usr/local/bin/unoconv \

View File

@ -7,7 +7,8 @@ ARG TARGETPLATFORM
RUN JDKPKG="openjdk11-jre"; \
if [[ $TARGETPLATFORM = linux/arm* ]]; then JDKPKG="openjdk8-jre"; fi; \
apk update && \
apk add --no-cache $JDKPKG bash tzdata
apk add --no-cache $JDKPKG bash tzdata && \
apk add 'zlib=1.2.12-r1'
WORKDIR /opt
RUN wget ${restserver_url:-https://github.com/eikek/docspell/releases/download/v$version/docspell-restserver-$version.zip} && \