mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-01 11:05:56 +01:00
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:
2
gradle/changelog/java_17.yaml
Normal file
2
gradle/changelog/java_17.yaml
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
- type: changed
|
||||||
|
description: Use Java 17 for Docker containers
|
||||||
@@ -61,7 +61,7 @@ task deb(type: Deb) {
|
|||||||
requires 'procps'
|
requires 'procps'
|
||||||
requires 'psmisc'
|
requires 'psmisc'
|
||||||
requires 'net-tools'
|
requires 'net-tools'
|
||||||
recommends 'openjdk-11-jre-headless'
|
recommends 'openjdk-17-jre-headless'
|
||||||
recommends 'mercurial'
|
recommends 'mercurial'
|
||||||
|
|
||||||
preInstallFile file('src/main/scripts/preinst')
|
preInstallFile file('src/main/scripts/preinst')
|
||||||
|
|||||||
@@ -23,10 +23,10 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
# Create minimal java version
|
# Create minimal java version
|
||||||
FROM alpine:3.16.0 as jre-build
|
FROM alpine:3.18.2 as jre-build
|
||||||
|
|
||||||
RUN set -x \
|
RUN set -x \
|
||||||
&& apk add --no-cache openjdk11-jdk openjdk11-jmods \
|
&& apk add --no-cache openjdk17-jdk openjdk17-jmods binutils \
|
||||||
&& jlink \
|
&& jlink \
|
||||||
--add-modules ALL-MODULE-PATH \
|
--add-modules ALL-MODULE-PATH \
|
||||||
--strip-debug \
|
--strip-debug \
|
||||||
@@ -39,7 +39,7 @@ RUN set -x \
|
|||||||
# ---
|
# ---
|
||||||
|
|
||||||
# SCM-Manager runtime
|
# SCM-Manager runtime
|
||||||
FROM alpine:3.16.0 as runtime
|
FROM alpine:3.18.2 as runtime
|
||||||
|
|
||||||
ENV SCM_HOME /var/lib/scm
|
ENV SCM_HOME /var/lib/scm
|
||||||
ENV CACHE_DIR /var/cache/scm/work
|
ENV CACHE_DIR /var/cache/scm/work
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
# Create minimal java version
|
# 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 \
|
RUN jlink \
|
||||||
--add-modules ALL-MODULE-PATH \
|
--add-modules ALL-MODULE-PATH \
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ task rpm(type: Rpm) {
|
|||||||
requires 'procps'
|
requires 'procps'
|
||||||
// recommends (weak dependency) is not supported,
|
// recommends (weak dependency) is not supported,
|
||||||
// so we define a hard dependencies for java and mercurial
|
// so we define a hard dependencies for java and mercurial
|
||||||
requires 'java-11-openjdk-headless'
|
requires 'java-17-openjdk-headless'
|
||||||
requires 'mercurial'
|
requires 'mercurial'
|
||||||
|
|
||||||
preInstall file('src/main/scripts/before-installation.sh')
|
preInstall file('src/main/scripts/before-installation.sh')
|
||||||
|
|||||||
Reference in New Issue
Block a user