diff --git a/Dockerfile b/Dockerfile index 96244be..bc4efbd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,18 +4,19 @@ FROM registry.fit2cloud.com/jumpserver/lina:${VERSION} as lina FROM registry.fit2cloud.com/jumpserver/luna:${VERSION} as luna FROM registry.fit2cloud.com/jumpserver/applets:${VERSION} as applets -FROM nginx:1.24-bullseye +FROM nginx:1.31-trixie ARG TARGETARCH ARG APT_MIRROR=http://mirrors.ustc.edu.cn RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=web \ - 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 \ && rm -f /etc/cron.daily/apt-compat \ && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ && apt-get update \ && apt-get install -y --no-install-recommends wget vim logrotate locales \ && echo "no" | dpkg-reconfigure dash \ - && echo "zh_CN.UTF-8" | dpkg-reconfigure locales \ + && sed -i "s@^# *zh_CN.UTF-8 UTF-8@zh_CN.UTF-8 UTF-8@" /etc/locale.gen \ + && locale-gen zh_CN.UTF-8 \ && rm -f /var/log/nginx/*.log \ && rm -rf /var/lib/apt/lists/*