diff --git a/Dockerfile-ee b/Dockerfile-ee index d4b2391e6..b485f1ecc 100644 --- a/Dockerfile-ee +++ b/Dockerfile-ee @@ -1,81 +1,9 @@ ARG VERSION FROM registry.fit2cloud.com/jumpserver/xpack:${VERSION} as build-xpack -FROM python:3.11-slim-bullseye as stage-build -ARG TARGETARCH +FROM jumpserver/core:${VERSION} -ARG VERSION -ENV VERSION=$VERSION - -WORKDIR /opt/jumpserver -ADD . . -RUN cd utils && bash -ixeu build.sh - -FROM python:3.11-slim-bullseye -ARG TARGETARCH - -ARG BUILD_DEPENDENCIES=" \ - g++ \ - make \ - pkg-config" - -ARG DEPENDENCIES=" \ - freetds-dev \ - libpq-dev \ - libffi-dev \ - libjpeg-dev \ - 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 \ - locales \ - nmap \ - openssh-client \ - sshpass \ - telnet \ - vim \ - wget" - -ARG APT_MIRROR=http://mirrors.ustc.edu.cn - -RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=core \ - sed -i "s@http://.*.debian.org@${APT_MIRROR}@g" /etc/apt/sources.list \ - && rm -f /etc/apt/apt.conf.d/docker-clean \ - && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ - && apt-get update \ - && apt-get -y install --no-install-recommends ${BUILD_DEPENDENCIES} \ - && apt-get -y install --no-install-recommends ${DEPENDENCIES} \ - && apt-get -y install --no-install-recommends ${TOOLS} \ - && mkdir -p /root/.ssh/ \ - && echo "Host *\n\tStrictHostKeyChecking no\n\tUserKnownHostsFile /dev/null\n\tCiphers +aes128-cbc\n\tKexAlgorithms +diffie-hellman-group1-sha1\n\tHostKeyAlgorithms +ssh-rsa" > /root/.ssh/config \ - && echo "set mouse-=a" > ~/.vimrc \ - && echo "no" | dpkg-reconfigure dash \ - && echo "zh_CN.UTF-8" | dpkg-reconfigure locales \ - && sed -i "s@# export @export @g" ~/.bashrc \ - && sed -i "s@# alias @alias @g" ~/.bashrc \ - && rm -rf /var/lib/apt/lists/* - -COPY --from=stage-build /opt/jumpserver/release/jumpserver /opt/jumpserver -WORKDIR /opt/jumpserver - -ARG PIP_MIRROR=https://pypi.douban.com/simple -RUN --mount=type=cache,target=/root/.cache \ - set -ex \ - && echo > /opt/jumpserver/config.yml \ - && pip install poetry -i ${PIP_MIRROR} \ - && poetry config virtualenvs.create false \ - && poetry install --only=main +COPY --from=build-xpack /opt/xpack /opt/jumpserver/apps/xpack RUN --mount=type=cache,target=/root/.cache \ set -ex \ - && poetry install --only=xpack + && poetry install --only=xpack \ No newline at end of file