From b9013e52ba4e97d5f12ef86302bddab23b40e5ae Mon Sep 17 00:00:00 2001
From: Rene Pfeuffer <rene.pfeuffer@cloudogu.com>
Date: Mon, 10 Jul 2023 14:23:13 +0200
Subject: [PATCH] Use Java 17 for Docker containers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Committed-by: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Co-authored-by: René Pfeuffer <rene.pfeuffer@cloudogu.com>
---
 gradle/changelog/java_17.yaml          | 2 ++
 scm-packaging/deb/build.gradle         | 2 +-
 scm-packaging/docker/Dockerfile.alpine | 6 +++---
 scm-packaging/docker/Dockerfile.debian | 2 +-
 scm-packaging/rpm/build.gradle         | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 gradle/changelog/java_17.yaml

diff --git a/gradle/changelog/java_17.yaml b/gradle/changelog/java_17.yaml
new file mode 100644
index 0000000000..b97bf82d6e
--- /dev/null
+++ b/gradle/changelog/java_17.yaml
@@ -0,0 +1,2 @@
+- type: changed
+  description: Use Java 17 for Docker containers
diff --git a/scm-packaging/deb/build.gradle b/scm-packaging/deb/build.gradle
index 9a2843e0fe..d193aef76b 100644
--- a/scm-packaging/deb/build.gradle
+++ b/scm-packaging/deb/build.gradle
@@ -61,7 +61,7 @@ task deb(type: Deb) {
   requires 'procps'
   requires 'psmisc'
   requires 'net-tools'
-  recommends 'openjdk-11-jre-headless'
+  recommends 'openjdk-17-jre-headless'
   recommends 'mercurial'
 
   preInstallFile file('src/main/scripts/preinst')
diff --git a/scm-packaging/docker/Dockerfile.alpine b/scm-packaging/docker/Dockerfile.alpine
index 97cff39f8d..678b830d6b 100644
--- a/scm-packaging/docker/Dockerfile.alpine
+++ b/scm-packaging/docker/Dockerfile.alpine
@@ -23,10 +23,10 @@
 #
 
 # Create minimal java version
-FROM alpine:3.16.0 as jre-build
+FROM alpine:3.18.2 as jre-build
 
 RUN set -x \
- && apk add --no-cache openjdk11-jdk openjdk11-jmods \
+ && apk add --no-cache openjdk17-jdk openjdk17-jmods binutils \
  && jlink \
     --add-modules ALL-MODULE-PATH \
     --strip-debug \
@@ -39,7 +39,7 @@ RUN set -x \
 # ---
 
 # SCM-Manager runtime
-FROM alpine:3.16.0 as runtime
+FROM alpine:3.18.2 as runtime
 
 ENV SCM_HOME /var/lib/scm
 ENV CACHE_DIR /var/cache/scm/work
diff --git a/scm-packaging/docker/Dockerfile.debian b/scm-packaging/docker/Dockerfile.debian
index 767dfbeef0..81c2ac5e26 100644
--- a/scm-packaging/docker/Dockerfile.debian
+++ b/scm-packaging/docker/Dockerfile.debian
@@ -23,7 +23,7 @@
 #
 
 # Create minimal java version
-FROM eclipse-temurin:11.0.14.1_1-jdk-focal as jre-build
+FROM eclipse-temurin:17.0.7_7-jdk-focal as jre-build
 
 RUN jlink \
     --add-modules ALL-MODULE-PATH \
diff --git a/scm-packaging/rpm/build.gradle b/scm-packaging/rpm/build.gradle
index ad228b84fa..17097d14a5 100644
--- a/scm-packaging/rpm/build.gradle
+++ b/scm-packaging/rpm/build.gradle
@@ -80,7 +80,7 @@ task rpm(type: Rpm) {
   requires 'procps'
   // recommends (weak dependency) is not supported,
   // so we define a hard dependencies for java and mercurial
-  requires 'java-11-openjdk-headless'
+  requires 'java-17-openjdk-headless'
   requires 'mercurial'
 
   preInstall file('src/main/scripts/before-installation.sh')