diff --git a/Dockerfile b/Dockerfile index 01b3d513b..3943380ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -81,13 +81,14 @@ ENV PIP_MIRROR=$PIP_MIRROR ARG PIP_JMS_MIRROR=https://pypi.douban.com/simple ENV PIP_JMS_MIRROR=$PIP_JMS_MIRROR -ARG DEBUG +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 a4752fde5..17aafb87f 100644 --- a/Dockerfile.loong64 +++ b/Dockerfile.loong64 @@ -68,7 +68,7 @@ ENV PIP_MIRROR=$PIP_MIRROR ARG PIP_JMS_MIRROR=https://pypi.douban.com/simple ENV PIP_JMS_MIRROR=$PIP_JMS_MIRROR -ARG DEBUG +ARG ANSIBLE_CORE_VERSION=2.14.1 RUN --mount=type=cache,target=/root/.cache/pip \ set -ex \ @@ -77,6 +77,7 @@ 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 436719406..431c03adf 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,6 +1,5 @@ aiofiles==22.1.0 amqp==5.0.9 -git+https://github.com/jumpserver/ansible@master#egg=ansible-core ansible-runner==2.2.1 asn1crypto==0.24.0 bcrypt==3.1.4