From b37f98e01f823028955f0ab053470d9a227f4262 Mon Sep 17 00:00:00 2001 From: eikek Date: Thu, 24 Nov 2022 23:56:23 +0100 Subject: [PATCH] Remove explicit install of zlib The explicit install was added earlier due to a broken zlib package (see issue #1517). This has now been fixed for a while in alpine and can be removed. --- docker/dockerfiles/joex.dockerfile | 1 - docker/dockerfiles/restserver.dockerfile | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/docker/dockerfiles/joex.dockerfile b/docker/dockerfiles/joex.dockerfile index 7a47ed2f..24de8aab 100644 --- a/docker/dockerfiles/joex.dockerfile +++ b/docker/dockerfiles/joex.dockerfile @@ -53,7 +53,6 @@ RUN apk update && \ qpdf-dev \ openssl-dev \ ocrmypdf \ - && apk add 'zlib=1.2.12-r3' \ && 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 038ed494..532eb049 100644 --- a/docker/dockerfiles/restserver.dockerfile +++ b/docker/dockerfiles/restserver.dockerfile @@ -5,8 +5,7 @@ ARG restserver_url= ARG TARGETPLATFORM RUN apk update && \ - apk add --no-cache openjdk17-jre bash tzdata curl && \ - apk add 'zlib=1.2.12-r3' + apk add --no-cache openjdk17-jre bash tzdata curl WORKDIR /opt RUN curl -L -O ${restserver_url:-https://github.com/eikek/docspell/releases/download/v$version/docspell-restserver-$version.zip} && \