From 7ac88682c221824a8714539fcb2d1a6c51ab78cf Mon Sep 17 00:00:00 2001
From: qzmo <qzmo@trip.com>
Date: Thu, 17 Oct 2024 16:57:47 +0800
Subject: [PATCH] chore: dockerfile update to 21

---
 Dockerfile        |  4 ++--
 Dockerfile-Tomcat | 13 -------------
 2 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 Dockerfile-Tomcat

diff --git a/Dockerfile b/Dockerfile
index 814234dd..e2f87313 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM maven:3-openjdk-8-slim as builder
+FROM maven:3.9.9-eclipse-temurin-21 as builder
 COPY . /usr/src/app/
 WORKDIR /usr/src/app/
 # buildkit support since docker 18.03
@@ -6,6 +6,6 @@ RUN --mount=type=cache,target=/root/.m2 mvn clean package -DskipTests -Pjar
 # use this if you are on docker<=18.02
 # RUN mvn clean package -DskipTests -Pjar
 
-FROM eclipse-temurin:8-jre
+FROM eclipse-temurin:21-jre
 COPY --from=builder /usr/src/app/arex-schedule-jar/schedule.jar app.jar
 ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /app.jar"]
diff --git a/Dockerfile-Tomcat b/Dockerfile-Tomcat
deleted file mode 100644
index 99ef9720..00000000
--- a/Dockerfile-Tomcat
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM maven:3-openjdk-8-slim as builder
-COPY . /usr/src/app/
-WORKDIR /usr/src/app/arex-schedule-web-api
-RUN mvn clean package -DskipTests
-
-FROM tomcat:9.0-jdk8-openjdk
-COPY --from=builder /usr/src/app/arex-schedule-web-api/target/arex-schedule-web-api.war /usr/local/tomcat/webapps/arex-schedule-web-api.war
-WORKDIR /usr/local/tomcat/conf
-RUN sed -i 'N;152a\\t<Context path="" docBase="arex-schedule-web-api.war" />' server.xml
-
-WORKDIR /usr/local/tomcat
-EXPOSE 8080
-CMD ["catalina.sh","run"]
\ No newline at end of file