From 3907ca1115ed451bb8fa82a23085a5fc56486c36 Mon Sep 17 00:00:00 2001
From: "xzx.weiliang" <1067599390@qq.com>
Date: Tue, 22 Aug 2023 14:50:43 +0800
Subject: [PATCH 1/4] Bump jdk from 1.8.0_212 to 1.8.0_382

Fixes security vulnerabilities in older versions.
---
 java8/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java8/Dockerfile b/java8/Dockerfile
index 0f0ea51..36f57e0 100644
--- a/java8/Dockerfile
+++ b/java8/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-alpine
+FROM eclipse-temurin:8-jdk-alpine
 
 ARG EXPOSE_PORT=8080
 EXPOSE ${EXPOSE_PORT}

From 60d2344b3325121a67a867debd0e6d50b61b867f Mon Sep 17 00:00:00 2001
From: "xzx.weiliang" <1067599390@qq.com>
Date: Tue, 22 Aug 2023 15:26:25 +0800
Subject: [PATCH 2/4] Replace jdk11 base image

---
 java11/Dockerfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/java11/Dockerfile b/java11/Dockerfile
index 6b4ae7c..e9969bc 100644
--- a/java11/Dockerfile
+++ b/java11/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:11-jre-slim
+FROM eclipse-temurin:11-jre-alpine
 
 ARG EXPOSE_PORT=8080
 EXPOSE ${EXPOSE_PORT}
@@ -19,9 +19,8 @@ LABEL io.k8s.description="Platform for running plain Java applications (fat-jar
       com.yunify.dev-mode.port="JAVA_DEBUG_PORT:5005"
 
 #Install package
-RUN apt update && apt -y install \
-      fontconfig \
-      && rm -rf /var/lib/apt/list/*
+RUN apk upgrade && apk add --update --no-cache ttf-dejavu fontconfig \
+    && fc-cache --force
 
 # S2I scripts + README
 COPY s2i /usr/local/s2i

From b0ce2c8185589905b47c04bf6c767bc237f664ba Mon Sep 17 00:00:00 2001
From: "xzx.weiliang" <1067599390@qq.com>
Date: Tue, 22 Aug 2023 15:30:04 +0800
Subject: [PATCH 3/4] Bump tomcat from 8.5.32 to 8.5.92

---
 tomcat85-java8/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tomcat85-java8/Dockerfile b/tomcat85-java8/Dockerfile
index e2d8ab3..f2c1067 100644
--- a/tomcat85-java8/Dockerfile
+++ b/tomcat85-java8/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-alpine
+FROM eclipse-temurin:8-jdk-alpine
 
 
 MAINTAINER kubesphere@yunify.com
@@ -20,7 +20,7 @@ LABEL io.kubesphere.s2i.version.maven="3.5.4" \
 
 EXPOSE 8080
 
-ENV TOMCAT_VERSION 8.5.32
+ENV TOMCAT_VERSION 8.5.92
 
 USER root
 

From 6961b48e0e311fe80193612409cea32ba6ddc569 Mon Sep 17 00:00:00 2001
From: "xzx.weiliang" <1067599390@qq.com>
Date: Tue, 22 Aug 2023 15:31:27 +0800
Subject: [PATCH 4/4] Bump tomcat from 8.5.32 to 8.5.92

---
 tomcat85-java11/Dockerfile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tomcat85-java11/Dockerfile b/tomcat85-java11/Dockerfile
index e441e32..aaafbdc 100644
--- a/tomcat85-java11/Dockerfile
+++ b/tomcat85-java11/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:11-jre-slim
+FROM eclipse-temurin:11-jre-alpine
 
 
 MAINTAINER kubesphere@yunify.com
@@ -20,14 +20,13 @@ LABEL io.kubesphere.s2i.version.maven="3.5.4" \
 
 EXPOSE 8080
 
-ENV TOMCAT_VERSION 8.5.32
+ENV TOMCAT_VERSION 8.5.92
 
 USER root
 
 #Install package
-RUN apt update && apt -y install \
-      fontconfig \
-      && rm -rf /var/lib/apt/list/*
+RUN apk upgrade && apk add --update --no-cache ttf-dejavu fontconfig \
+    && fc-cache --force
 
 # Get and Unpack Tomcat
 RUN apt-get update \