TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-05 19:09:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1572 from eikek/docker-migrations

Browse Source 
Another try fixing the zlib issue in docker images
This commit is contained in:
mergify[bot] 2022-05-25 22:09:59 +00:00 committed by GitHub
commit 3d24381f97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/docker-compose/docker-compose.yml
View File

@ -41,6 +41,8 @@ services:
- DOCSPELL_SERVER_BACKEND_SIGNUP_MODE=open - DOCSPELL_SERVER_BACKEND_SIGNUP_MODE=open
- DOCSPELL_SERVER_BACKEND_SIGNUP_NEW__INVITE__PASSWORD= - DOCSPELL_SERVER_BACKEND_SIGNUP_NEW__INVITE__PASSWORD=
- DOCSPELL_SERVER_BACKEND_ADDONS_ENABLED=false - 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: depends_on:
- solr - solr
- db - db

1
docker/dockerfiles/joex.dockerfile
View File

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

3
docker/dockerfiles/restserver.dockerfile
View File

@ -7,7 +7,8 @@ ARG TARGETPLATFORM
RUN JDKPKG="openjdk11-jre"; \ RUN JDKPKG="openjdk11-jre"; \
if [[ $TARGETPLATFORM = linux/arm* ]]; then JDKPKG="openjdk8-jre"; fi; \ if [[ $TARGETPLATFORM = linux/arm* ]]; then JDKPKG="openjdk8-jre"; fi; \
apk update && \ 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 WORKDIR /opt
RUN wget ${restserver_url:-https://github.com/eikek/docspell/releases/download/v$version/docspell-restserver-$version.zip} && \ RUN wget ${restserver_url:-https://github.com/eikek/docspell/releases/download/v$version/docspell-restserver-$version.zip} && \