Browse Source

Merge pull request #9340 from jumpserver/pr@dev@perf_ansible_core

chore: update ansible_core
pull/9343/head
吴小白 2 years ago committed by GitHub
parent
commit
37e471e950
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      Dockerfile
  2. 3
      Dockerfile.loong64
  3. 1
      requirements/requirements.txt

3
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

3
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} \

1
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

Loading…
Cancel
Save