Skip to content

Commit 6df851e

Browse files
committed
Standardise on Adoptium Temurin Eclipse OpenJDK. This is the same as what is used in jore4-map-matching and jore4-hastus.
Update JRE from 11 (LTS) to 17 (LTS) to enabe migration to Spring Boot 3 in the future.
1 parent ebf162c commit 6df851e

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/workflows/generate-jooq.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
with:
2020
custom_docker_compose: ./docker/docker-compose.custom.yml
2121

22-
- name: Set up JDK 11
22+
- name: Set up JDK 17
2323
uses: actions/setup-java@v3
2424
with:
25-
java-version: "11"
25+
java-version: "17"
2626
java-package: jdk
2727
architecture: x64
2828
distribution: temurin

.github/workflows/java-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
with:
2020
custom_docker_compose: ./docker/docker-compose.custom.yml
2121

22-
- name: Set up JDK 11
22+
- name: Set up JDK 17
2323
uses: actions/setup-java@v3
2424
with:
25-
java-version: "11"
25+
java-version: "17"
2626
java-package: jdk
2727
architecture: x64
2828
distribution: temurin

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# builder docker image
2-
FROM maven:3-openjdk-11 AS builder
2+
FROM maven:3-eclipse-temurin-17 AS builder
33

44
# set up workdir
55
WORKDIR /build
@@ -14,7 +14,7 @@ COPY ./profiles/prod /build/profiles/prod
1414
RUN mvn clean package spring-boot:repackage -Pprod
1515

1616
# distributed docker image
17-
FROM openjdk:11-jre
17+
FROM eclipse-temurin:17.0.7_7-jre
1818

1919
# expose server port
2020
EXPOSE 8080

0 commit comments

Comments
 (0)