From f5fcd024bd51f77f4eb9221b813dc3128584df21 Mon Sep 17 00:00:00 2001 From: JornC Date: Wed, 7 Feb 2024 14:28:42 +0100 Subject: [PATCH 1/8] Updoot to java 17 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 169d353..c7b451b 100644 --- a/pom.xml +++ b/pom.xml @@ -60,8 +60,8 @@ UTF-8 - 11 - 11 + 17 + 17 5.1.0-2 3.10.1 From 63058e0def465c8d8eb96ed5c504e773b1e8117c Mon Sep 17 00:00:00 2001 From: JornC Date: Wed, 7 Feb 2024 14:37:28 +0100 Subject: [PATCH 2/8] Add JDK_VERSION to perhaps 1 or 2 too many actions, but can't hurt --- .../workflows/on-pull_request-opened-synchronize-reopened.yml | 2 ++ .github/workflows/on-push.yml | 2 ++ .github/workflows/on-release-published.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/.github/workflows/on-pull_request-opened-synchronize-reopened.yml b/.github/workflows/on-pull_request-opened-synchronize-reopened.yml index f2b8ed4..61f0d35 100644 --- a/.github/workflows/on-pull_request-opened-synchronize-reopened.yml +++ b/.github/workflows/on-pull_request-opened-synchronize-reopened.yml @@ -19,9 +19,11 @@ jobs: - uses: aerius/github-actions/events/pull_request-event-action@v1.0.2 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + JDK_VERSION: 17 - uses: aerius/github-actions/extras/docker-build-action@v1.0.2 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} DOCKER_IMAGE_NAME: ${{ github.event.repository.name }} DOCKERFILE_LOCATION: docker/service/Dockerfile + JDK_VERSION: 17 diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml index 9ecc30a..51a66b5 100644 --- a/.github/workflows/on-push.yml +++ b/.github/workflows/on-push.yml @@ -21,6 +21,7 @@ jobs: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }} NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} + JDK_VERSION: 17 - uses: aerius/github-actions/extras/docker-build-or-publish-based-on-maven-project-version-action@v1.0.2 with: @@ -29,3 +30,4 @@ jobs: DOCKER_REGISTRY_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} DOCKER_IMAGE_NAME: ${{ github.event.repository.name }} DOCKERFILE_LOCATION: docker/service/Dockerfile + JDK_VERSION: 17 diff --git a/.github/workflows/on-release-published.yml b/.github/workflows/on-release-published.yml index dd90719..c0d9565 100644 --- a/.github/workflows/on-release-published.yml +++ b/.github/workflows/on-release-published.yml @@ -22,6 +22,7 @@ jobs: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }} NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} + JDK_VERSION: 17 - uses: aerius/github-actions/extras/docker-publish-action@v1.0.2 with: @@ -30,3 +31,4 @@ jobs: DOCKER_REGISTRY_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} DOCKER_IMAGE_NAME: ${{ github.event.repository.name }} DOCKERFILE_LOCATION: docker/service/Dockerfile + JDK_VERSION: 17 From c52e64b8d02682bc4ffa4f694d69927a7a972101 Mon Sep 17 00:00:00 2001 From: JornC Date: Wed, 7 Feb 2024 14:41:50 +0100 Subject: [PATCH 3/8] Upgrade to 3-openjdk-17 --- docker/service/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/service/Dockerfile b/docker/service/Dockerfile index 621f326..46330dc 100644 --- a/docker/service/Dockerfile +++ b/docker/service/Dockerfile @@ -1,5 +1,5 @@ # Builder part for maven packaging. -FROM maven:3-openjdk-11 as builder +FROM maven:3-openjdk-17 as builder WORKDIR /app From 0b22893f781118a198cd22074b19b9735bfbdd06 Mon Sep 17 00:00:00 2001 From: JornC Date: Wed, 7 Feb 2024 14:43:16 +0100 Subject: [PATCH 4/8] Remove a wrong jdk_version addition --- .../workflows/on-pull_request-opened-synchronize-reopened.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/on-pull_request-opened-synchronize-reopened.yml b/.github/workflows/on-pull_request-opened-synchronize-reopened.yml index 61f0d35..6f08dd3 100644 --- a/.github/workflows/on-pull_request-opened-synchronize-reopened.yml +++ b/.github/workflows/on-pull_request-opened-synchronize-reopened.yml @@ -26,4 +26,3 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} DOCKER_IMAGE_NAME: ${{ github.event.repository.name }} DOCKERFILE_LOCATION: docker/service/Dockerfile - JDK_VERSION: 17 From 3d808e92691f2a113be514041a1ee3d549a171d8 Mon Sep 17 00:00:00 2001 From: JornC Date: Wed, 7 Feb 2024 14:44:22 +0100 Subject: [PATCH 5/8] Remove another --- .github/workflows/on-release-published.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/on-release-published.yml b/.github/workflows/on-release-published.yml index c0d9565..f0e178a 100644 --- a/.github/workflows/on-release-published.yml +++ b/.github/workflows/on-release-published.yml @@ -31,4 +31,3 @@ jobs: DOCKER_REGISTRY_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} DOCKER_IMAGE_NAME: ${{ github.event.repository.name }} DOCKERFILE_LOCATION: docker/service/Dockerfile - JDK_VERSION: 17 From d279611f104832331a916a522a5f27007ea36336 Mon Sep 17 00:00:00 2001 From: JornC Date: Wed, 7 Feb 2024 14:50:14 +0100 Subject: [PATCH 6/8] Upgrade dockerfile with temurin --- docker/service/Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docker/service/Dockerfile b/docker/service/Dockerfile index 46330dc..8542e53 100644 --- a/docker/service/Dockerfile +++ b/docker/service/Dockerfile @@ -1,8 +1,11 @@ # Builder part for maven packaging. -FROM maven:3-openjdk-17 as builder +FROM eclipse-temurin:17 as builder WORKDIR /app +RUN apt-get update && \ + apt-get install -y maven + # Do the actual build COPY . /app RUN mvn --no-transfer-progress -DskipTests=true clean package @@ -12,7 +15,7 @@ RUN mv -v search-service/target/search-service-*.jar app.jar \ # Clean up image so we can rerun without the cache being invalidated because target files are changed && mvn clean -FROM openjdk:11-jre +FROM eclipse-temurin:17 WORKDIR /app From 6fb7545fcd1433e1caf9489c1207401fc435b6a9 Mon Sep 17 00:00:00 2001 From: JornC Date: Wed, 7 Feb 2024 15:06:17 +0100 Subject: [PATCH 7/8] Use temurin maven --- docker/service/Dockerfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docker/service/Dockerfile b/docker/service/Dockerfile index 8542e53..8fbdc6e 100644 --- a/docker/service/Dockerfile +++ b/docker/service/Dockerfile @@ -1,11 +1,8 @@ # Builder part for maven packaging. -FROM eclipse-temurin:17 as builder +FROM maven:3-eclipse-temurin-17 as builder WORKDIR /app -RUN apt-get update && \ - apt-get install -y maven - # Do the actual build COPY . /app RUN mvn --no-transfer-progress -DskipTests=true clean package From 6d84596140c86a026a74dbbdacacf40de31badc4 Mon Sep 17 00:00:00 2001 From: JornC Date: Wed, 7 Feb 2024 15:11:16 +0100 Subject: [PATCH 8/8] Use 17-jre --- docker/service/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/service/Dockerfile b/docker/service/Dockerfile index 8fbdc6e..cf65521 100644 --- a/docker/service/Dockerfile +++ b/docker/service/Dockerfile @@ -12,7 +12,7 @@ RUN mv -v search-service/target/search-service-*.jar app.jar \ # Clean up image so we can rerun without the cache being invalidated because target files are changed && mvn clean -FROM eclipse-temurin:17 +FROM eclipse-temurin:17-jre WORKDIR /app