From 9e26c8917e7fd1f20592a9be48ba1fb7677062dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com> Date: Thu, 4 Jul 2024 13:23:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/Dockerfile | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/core/Dockerfile b/core/Dockerfile index 37182bd..d54da23 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -42,7 +42,7 @@ RUN set -e \ && chmod +x /opt/jumpserver/entrypoint.sh \ && rm -rf /opt/jumpserver/.git /opt/jumpserver/.github -FROM python:3.11-slim-bookworm AS stage-2 +FROM python:3.11-slim-bullseye as stage-2 ARG TARGETARCH ARG BUILD_DEPENDENCIES=" \ @@ -51,29 +51,12 @@ ARG BUILD_DEPENDENCIES=" \ pkg-config" ARG DEPENDENCIES=" \ + default-libmysqlclient-dev \ freetds-dev \ - libpq-dev \ - libffi-dev \ - libjpeg-dev \ + gettext \ + libkrb5-dev \ libldap2-dev \ - libsasl2-dev \ - libssl-dev \ - libxml2-dev \ - libxmlsec1-dev \ - libxmlsec1-openssl \ - freerdp2-dev \ - libaio-dev" - -ARG TOOLS=" \ - ca-certificates \ - curl \ - default-libmysqlclient-dev \ - default-mysql-client \ - git \ - git-lfs \ - unzip \ - xz-utils \ - wget" + libsasl2-dev" RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked \ @@ -120,9 +103,7 @@ ENV LANG=en_US.UTF-8 \ ARG DEPENDENCIES=" \ libldap2-dev \ - libpq-dev \ - libx11-dev \ - libxmlsec1-openssl" + libx11-dev" ARG TOOLS=" \ bubblewrap \