From db1c8b519da55ee9ac7df4cf467f44aba934eacb Mon Sep 17 00:00:00 2001
From: Jonas Schoenenberger <jonas.schoenenberger@pm.me>
Date: Tue, 23 Aug 2022 08:32:44 +0200
Subject: [PATCH] set jdk17 for all platforms

---
 docker/dockerfiles/restserver.dockerfile | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/docker/dockerfiles/restserver.dockerfile b/docker/dockerfiles/restserver.dockerfile
index 362ea7ed..01326e7a 100644
--- a/docker/dockerfiles/restserver.dockerfile
+++ b/docker/dockerfiles/restserver.dockerfile
@@ -1,21 +1,19 @@
-FROM alpine:3.14
+FROM alpine:3.16
 
 ARG version=
 ARG restserver_url=
 ARG TARGETPLATFORM
 
-RUN JDKPKG="openjdk11-jre"; \
-    if [[ $TARGETPLATFORM = linux/arm* ]]; then JDKPKG="openjdk8-jre"; fi; \
-    apk update && \
-    apk add --no-cache $JDKPKG bash tzdata && \
+RUN apk update && \
+    apk add --no-cache openjdk17-jre bash tzdata curl && \
     apk add 'zlib=1.2.12-r3'
 
 WORKDIR /opt
-RUN wget ${restserver_url:-https://github.com/eikek/docspell/releases/download/v$version/docspell-restserver-$version.zip} && \
-  unzip docspell-restserver-*.zip && \
-  rm docspell-restserver-*.zip && \
-  ln -snf docspell-restserver-* docspell-restserver && \
-  rm docspell-restserver/conf/docspell-server.conf
+RUN curl -L -O ${restserver_url:-https://github.com/eikek/docspell/releases/download/v$version/docspell-restserver-$version.zip} && \
+    unzip docspell-restserver-*.zip && \
+    rm docspell-restserver-*.zip && \
+    ln -snf docspell-restserver-* docspell-restserver && \
+    rm docspell-restserver/conf/docspell-server.conf
 
 ENTRYPOINT ["/opt/docspell-restserver/bin/docspell-restserver", "-J-XX:+UseG1GC"]
 EXPOSE 7880