From d5461fe66f936674c9f4e3c1161a6c5d6eeb515e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Mon, 24 Jul 2023 21:09:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?perf:=20=E6=8B=86=E5=88=86=20loong64=20?=
 =?UTF-8?q?=E6=9E=B6=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7b71a8927..992c9fca8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -83,21 +83,10 @@ WORKDIR /tmp/build
 COPY ./requirements ./requirements
 
 ARG PIP_MIRROR=https://pypi.douban.com/simple
-ARG PIP_JMS_MIRROR=https://pypi.douban.com/simple
 
 RUN --mount=type=cache,target=/root/.cache/pip \
     set -ex \
     && pip config set global.index-url ${PIP_MIRROR} \
-    && pip install --upgrade pip \
-    && pip install --upgrade setuptools wheel \
-    && \
-    if [ "${TARGETARCH}" == "loong64" ]; then \
-        pip install https://download.jumpserver.org/pypi/simple/cryptography/cryptography-38.0.4-cp39-cp39-linux_loongarch64.whl; \
-        pip install https://download.jumpserver.org/pypi/simple/greenlet/greenlet-1.1.2-cp39-cp39-linux_loongarch64.whl; \
-        pip install https://download.jumpserver.org/pypi/simple/PyNaCl/PyNaCl-1.5.0-cp39-cp39-linux_loongarch64.whl; \
-        pip install https://download.jumpserver.org/pypi/simple/grpcio/grpcio-1.54.2-cp39-cp39-linux_loongarch64.whl; \
-    fi \
-    && pip install $(grep -E 'jms|jumpserver' requirements/requirements.txt) -i ${PIP_JMS_MIRROR} \
     && pip install -r requirements/requirements.txt
 
 COPY --from=stage-build /opt/jumpserver/release/jumpserver /opt/jumpserver

From 94d40efcada50a6fe5ed9ea1c92f2394b777c4e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Mon, 24 Jul 2023 21:16:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?perf:=20=E9=A2=84=E6=9E=84=E5=BB=BA=20ansib?=
 =?UTF-8?q?le-core?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                    | 2 ++
 requirements/requirements.txt | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 992c9fca8..14756e408 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -82,11 +82,13 @@ RUN set -ex \
 WORKDIR /tmp/build
 COPY ./requirements ./requirements
 
+ARG ANSIBLE_CORE_VERSION=2.14.1
 ARG PIP_MIRROR=https://pypi.douban.com/simple
 
 RUN --mount=type=cache,target=/root/.cache/pip \
     set -ex \
     && pip config set global.index-url ${PIP_MIRROR} \
+    && pip install https://github.com/jumpserver/ansible/releases/download/v${ANSIBLE_CORE_VERSION}/ansible_core-${ANSIBLE_CORE_VERSION}-py3-none-any.whl \
     && pip install -r requirements/requirements.txt
 
 COPY --from=stage-build /opt/jumpserver/release/jumpserver /opt/jumpserver
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 065a18fba..30a5d66cf 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -2,7 +2,7 @@
 cython==3.0.0
 aiofiles==23.1.0
 amqp==5.1.1
-git+https://github.com/jumpserver/ansible@master#egg=ansible-core
+#git+https://github.com/jumpserver/ansible@master#egg=ansible-core
 ansible==7.1.0
 ansible-runner==2.3.3
 asn1crypto==1.5.1