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

Merge github.com:jgirardet/docspell

Browse Source
This commit is contained in:
Jimmy Girardet
2022-03-08 09:50:36 +01:00
parent 3c82975453 8cd3e5efdd
commit 79e9afc76e
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/dockerfiles/build.sh
View File

@ -32,7 +32,7 @@ cd "$(dirname "$0")"
trap "{ docker buildx rm docspell-builder; }" EXIT trap "{ docker buildx rm docspell-builder; }" EXIT
platforms="linux/amd64,linux/aarch64,linux/arm/v7" platforms="linux/amd64,linux/arm64,linux/arm/v7"
docker buildx create --name docspell-builder --use docker buildx create --name docspell-builder --use
case $version in case $version in

7
docker/dockerfiles/joex.dockerfile
View File

@ -5,10 +5,9 @@ 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
ENV JAVA_OPTS="-Xmx1536M" RUN JDKPKG="openjdk11-jre"; \
if [[ $TARGETPLATFORM = linux/arm* ]]; then JDKPKG="openjdk8-jre"; fi; \
RUN JDKPKG="openjdk11"; \ apk update && \
if [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then JDKPKG="openjdk8"; fi; \
apk add --no-cache $JDKPKG \ apk add --no-cache $JDKPKG \
tzdata \ tzdata \
bash \ bash \

5
docker/dockerfiles/restserver.dockerfile
View File

@ -4,8 +4,9 @@ ARG version=
ARG restserver_url= ARG restserver_url=
ARG TARGETPLATFORM ARG TARGETPLATFORM
RUN JDKPKG="openjdk11"; \ RUN JDKPKG="openjdk11-jre"; \
if [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then JDKPKG="openjdk8"; fi; \ 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
WORKDIR /opt WORKDIR /opt