diff --git a/Dockerfile b/Dockerfile index 14ca700..0d0b402 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM jumpserver/chen-base:20251011_081112 AS stage-build +FROM jumpserver/chen-base:20251114_082449 AS stage-build ENV LANG=en_US.UTF-8 WORKDIR /opt/chen/ @@ -9,21 +9,21 @@ 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} \ && 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 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 \ diff --git a/pom.xml b/pom.xml index 77abf63..4ad7033 100644 --- a/pom.xml +++ b/pom.xml @@ -21,10 +21,10 @@ 0.0.1 - 17 + 21 3.9.0 - 17 - 17 + 21 + 21 UTF-8 1.12.1 @@ -50,7 +50,7 @@ org.projectlombok lombok - 1.18.26 + 1.18.38 com.alibaba