Skip to content

Commit

Permalink
Merge pull request #383 from FraunhoferISST/chore/java21_backend
Browse files Browse the repository at this point in the history
Chore: update backend to Java 21
  • Loading branch information
tom-rm-meyer-ISST authored May 21, 2024
2 parents 1cc4fd6 + 129e3ac commit d743558
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 78 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
if: ${{ matrix.language == 'java' }}
uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
with:
java-version: 17
java-version: 21
distribution: temurin
java-package: jdk
cache: maven
Expand Down
2 changes: 1 addition & 1 deletion backend/DOCKER_NOTICE.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Eclipse Tractus-X product(s) installed within the image:
- Project license: [Apache License, Version 2.0](https://github.com/eclipse-tractusx/puris/blob/main/backend/LICENSE)

**Used Base Image [Backend]**
`eclipse-temurin:17-jre-alpine`
`eclipse-temurin:21-jre-alpine`

- DockerHub: https://hub.docker.com/_/eclipse-temurin
- GitHub project: https://github.com/adoptium/containers
Expand Down
6 changes: 3 additions & 3 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#
# SPDX-License-Identifier: Apache-2.0
#
FROM maven:3.8.7-eclipse-temurin-17 as build
FROM maven:3.9.6-eclipse-temurin-21 as build
RUN mkdir /app
WORKDIR /app
COPY pom.xml .
Expand All @@ -27,11 +27,11 @@ RUN mvn dependency:go-offline
COPY src/ /app/src/
RUN mvn clean package -DskipTests

FROM eclipse-temurin:17-jre-alpine
FROM eclipse-temurin:21-jre-alpine
RUN mkdir /opt/app
COPY --from=build /app/target/*.jar /opt/app/puris-backend.jar

RUN adduser -u 8877 -D nonroot && chmod 755 /opt/app/puris-backend.jar
RUN adduser -u 8877 --disabled-password --gecos "" --no-create-home nonroot && chmod 755 /opt/app/puris-backend.jar

USER nonroot

Expand Down
42 changes: 0 additions & 42 deletions backend/docker-compose.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<name>puris-backend</name>
<description>PURIS Backend</description>
<properties>
<java.version>17</java.version>
<java.version>21</java.version>
<springdoc.version>2.5.0</springdoc.version>
<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
<snakeyaml.version>2.2</snakeyaml.version>
Expand Down
30 changes: 0 additions & 30 deletions frontend/docker-compose.yaml

This file was deleted.

0 comments on commit d743558

Please sign in to comment.