diff --git a/Dockerfile b/Dockerfile index 7b71a8927..14756e408 100644 --- a/Dockerfile +++ b/Dockerfile @@ -82,22 +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 -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 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