From 193352f3f44bf8de692c113a074e678496fd9cc7 Mon Sep 17 00:00:00 2001
From: Bruno Verachten <gounthar@gmail.com>
Date: Mon, 9 Oct 2023 16:52:11 +0200
Subject: [PATCH 1/2] chore(docker): Update jetty base image

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index f0f474c..beb85a0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM jetty:9-jdk8-eclipse-temurin
+FROM jetty:12.0.1-jdk17-eclipse-temurin
 COPY target/*.war $JETTY_BASE/webapps/ROOT.war
 RUN java -jar $JETTY_HOME/start.jar \
   --create-startd \

From 81b21f1929a7727ac7dcd50493351751bea45423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= <lemeurherve.jenkins@gmail.com>
Date: Tue, 7 Nov 2023 17:46:41 +0100
Subject: [PATCH 2/2] set the same jetty version in both Dockerfiles

---
 deploy/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/Dockerfile b/deploy/Dockerfile
index acbb224..5b76220 100644
--- a/deploy/Dockerfile
+++ b/deploy/Dockerfile
@@ -1,4 +1,4 @@
-FROM jetty:9-alpine
+FROM jetty:12.0.1-jdk17-eclipse-temurin
 
 USER root