From 5cd5ba46af6071c8f7d4d51bb5523f3b13bae475 Mon Sep 17 00:00:00 2001 From: eikek Date: Wed, 25 May 2022 23:49:58 +0200 Subject: [PATCH] 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 --- docker/docker-compose/docker-compose.yml | 2 ++ docker/dockerfiles/joex.dockerfile | 1 + docker/dockerfiles/restserver.dockerfile | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docker/docker-compose/docker-compose.yml b/docker/docker-compose/docker-compose.yml index e0be83cb..b65af7f2 100644 --- a/docker/docker-compose/docker-compose.yml +++ b/docker/docker-compose/docker-compose.yml @@ -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 diff --git a/docker/dockerfiles/joex.dockerfile b/docker/dockerfiles/joex.dockerfile index 318f3600..fcbecf97 100644 --- a/docker/dockerfiles/joex.dockerfile +++ b/docker/dockerfiles/joex.dockerfile @@ -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 \ diff --git a/docker/dockerfiles/restserver.dockerfile b/docker/dockerfiles/restserver.dockerfile index c40941f4..cd0d7003 100644 --- a/docker/dockerfiles/restserver.dockerfile +++ b/docker/dockerfiles/restserver.dockerfile @@ -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} && \