Use Java 17 for Docker containers

Committed-by: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Co-authored-by: René Pfeuffer <rene.pfeuffer@cloudogu.com>
This commit is contained in:
Rene Pfeuffer
2023-07-10 14:23:13 +02:00
parent 50e64bb74e
commit b9013e52ba
5 changed files with 8 additions and 6 deletions

View File

@@ -0,0 +1,2 @@
- type: changed
description: Use Java 17 for Docker containers

View File

@@ -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')

View File

@@ -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

View File

@@ -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 \

View File

@@ -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')