From 8698f62052fb4519b9fa5c5d078ab26efe380b2a Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Fri, 14 Nov 2025 15:08:41 +0800
Subject: [PATCH 1/4] perf: upgrade to trixie (#140)

* perf: upgrade to trixie

* perf: update openjdk-21-jdk-headless

* perf: Update Dockerfile with new base image tag

---------

Co-authored-by: Eric <xplzv@126.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 Dockerfile      | 8 ++++----
 Dockerfile-base | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 14ca700..1a9d184 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM jumpserver/chen-base:20251011_081112 AS stage-build
+FROM jumpserver/chen-base:20251114_070058 AS stage-build
 ENV LANG=en_US.UTF-8
 
 WORKDIR /opt/chen/
@@ -9,16 +9,16 @@ RUN cd frontend \
 
 RUN mvn clean package -Dmaven.test.skip=true
 
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 
 ARG DEPENDENCIES="                    \
         ca-certificates               \
-        openjdk-17-jre-headless"
+        openjdk-21-jdk-headless"
 
 ARG APT_MIRROR=http://deb.debian.org
 
 RUN set -ex \
-    && sed -i "s@http://.*.debian.org@${APT_MIRROR}@g" /etc/apt/sources.list \
+    && sed -i "s@http://.*.debian.org@${APT_MIRROR}@g" /etc/apt/sources.list.d/debian.sources \
     && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
     && apt-get update \
     && apt-get install -y --no-install-recommends ${DEPENDENCIES} \
diff --git a/Dockerfile-base b/Dockerfile-base
index 9afa162..96fd42f 100644
--- a/Dockerfile-base
+++ b/Dockerfile-base
@@ -1,17 +1,17 @@
-FROM node:20.15-bullseye-slim
+FROM node:20-trixie
 ARG TARGETARCH
 
 # Install linux dependencies
 ARG DEPENDENCIES="                    \
         ca-certificates              \
-        openjdk-17-jre-headless       \
+        openjdk-21-jdk-headless       \
         curl                          \
         wget"
 
 ARG APT_MIRROR=http://deb.debian.org
 
 RUN set -ex \
-    && sed -i "s@http://.*.debian.org@${APT_MIRROR}@g" /etc/apt/sources.list \
+    && sed -i "s@http://.*.debian.org@${APT_MIRROR}@g" /etc/apt/sources.list.d/debian.sources \
     && apt-get update \
     && apt-get -y install --no-install-recommends ${DEPENDENCIES} \
     && echo "no" | dpkg-reconfigure dash \

From bf188a90094f9e55eb99bd25d63f4084534a504c Mon Sep 17 00:00:00 2001
From: Eric <xplzv@126.com>
Date: Fri, 14 Nov 2025 15:42:17 +0800
Subject: [PATCH 2/4] perf: update dockerfile

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

diff --git a/Dockerfile b/Dockerfile
index 1a9d184..efe7b57 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@ RUN set -ex \
     && apt-get update \
     && apt-get install -y --no-install-recommends ${DEPENDENCIES} \
     && echo "no" | dpkg-reconfigure dash \
-    && sed -i "s@jdk.tls.disabledAlgorithms=SSLv3, TLSv1, TLSv1.1@jdk.tls.disabledAlgorithms=SSLv3@" /etc/java-17-openjdk/security/java.security
+    && sed -i "s@jdk.tls.disabledAlgorithms=SSLv3, TLSv1, TLSv1.1@jdk.tls.disabledAlgorithms=SSLv3@" /etc/java-21-openjdk/security/java.security
 
 WORKDIR /opt/chen
 

From c612994272ef028876b94ea5a9c70610dd82ef1f Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Fri, 14 Nov 2025 16:19:07 +0800
Subject: [PATCH 3/4] perf: update deps (#142)

* perf: update deps

* perf: Update Dockerfile with new base image tag

---------

Co-authored-by: Eric <xplzv@126.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 Dockerfile | 2 +-
 pom.xml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index efe7b57..3acba11 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM jumpserver/chen-base:20251114_070058 AS stage-build
+FROM jumpserver/chen-base:20251114_075836 AS stage-build
 ENV LANG=en_US.UTF-8
 
 WORKDIR /opt/chen/
diff --git a/pom.xml b/pom.xml
index 77abf63..6f61340 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.26</version>
+            <version>1.18.38</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>

From 918c95e3b0a8abc2e090935662a62bc56fa2d2c4 Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Fri, 14 Nov 2025 17:35:07 +0800
Subject: [PATCH 4/4] feat: update pom (#143)

* feat: update pom

* perf: Update Dockerfile with new base image tag

---------

Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 Dockerfile | 2 +-
 pom.xml    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3acba11..0d0b402 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM jumpserver/chen-base:20251114_075836 AS stage-build
+FROM jumpserver/chen-base:20251114_082449 AS stage-build
 ENV LANG=en_US.UTF-8
 
 WORKDIR /opt/chen/
diff --git a/pom.xml b/pom.xml
index 6f61340..4ad7033 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,10 +21,10 @@
 
     <properties>
         <revision>0.0.1</revision>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version>