From 72b11634718c47fb945e0299726b418470bab647 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Sun, 29 Jan 2023 10:52:04 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=20ansible=20?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                    | 3 ---
 Dockerfile.loong64            | 3 ---
 requirements/requirements.txt | 2 ++
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3943380ee..a7d6d2b9c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -81,14 +81,11 @@ ENV PIP_MIRROR=$PIP_MIRROR
 ARG PIP_JMS_MIRROR=https://pypi.douban.com/simple
 ENV PIP_JMS_MIRROR=$PIP_JMS_MIRROR
 
-ARG ANSIBLE_CORE_VERSION=2.14.1
-
 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 \
-    && pip install https://download.jumpserver.org/pypi/simple/ansible_core/ansible_core-${ANSIBLE_CORE_VERSION}-py3-none-any.whl \
     && pip install $(grep -E 'jms|jumpserver' requirements/requirements.txt) -i ${PIP_JMS_MIRROR} \
     && pip install -r requirements/requirements.txt
 
diff --git a/Dockerfile.loong64 b/Dockerfile.loong64
index 17aafb87f..4493e0c4c 100644
--- a/Dockerfile.loong64
+++ b/Dockerfile.loong64
@@ -68,8 +68,6 @@ ENV PIP_MIRROR=$PIP_MIRROR
 ARG PIP_JMS_MIRROR=https://pypi.douban.com/simple
 ENV PIP_JMS_MIRROR=$PIP_JMS_MIRROR
 
-ARG ANSIBLE_CORE_VERSION=2.14.1
-
 RUN --mount=type=cache,target=/root/.cache/pip \
     set -ex \
     && pip config set global.index-url ${PIP_MIRROR} \
@@ -77,7 +75,6 @@ RUN --mount=type=cache,target=/root/.cache/pip \
     && pip install --upgrade setuptools wheel \
     && 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/ansible_core/ansible_core-${ANSIBLE_CORE_VERSION}-py3-none-any.whl \
     && pip install $(grep 'PyNaCl' requirements/requirements.txt) \
     && GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=true pip install grpcio \
     && pip install $(grep -E 'jms|jumpserver' requirements/requirements.txt) -i ${PIP_JMS_MIRROR} \
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 431c03adf..6e34fbe7c 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -1,5 +1,7 @@
 aiofiles==22.1.0
 amqp==5.0.9
+git+https://gitee.com/jumpserver/ansible@master#egg=ansible-core
+ansible==6.7.0
 ansible-runner==2.2.1
 asn1crypto==0.24.0
 bcrypt==3.1.4