Skip to content

Commit

Permalink
fix: 修正构建错误
Browse files Browse the repository at this point in the history
  • Loading branch information
wojiushixiaobai committed Jul 4, 2024
1 parent acf5839 commit 9e26c89
Showing 1 changed file with 6 additions and 25 deletions.
31 changes: 6 additions & 25 deletions core/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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=" \
Expand All @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down

0 comments on commit 9e26c89

Please sign in to comment.