Skip to content

Commit f9ce35f

Browse files
committed
Revert "build(deps): bump ansible from 2.9.15 to 2.10.0 in /images/ansible-operator (#4728)"
This reverts commit 605fb39.
1 parent 605fb39 commit f9ce35f

File tree

4 files changed

+18
-87
lines changed

4 files changed

+18
-87
lines changed

changelog/fragments/ansible-2.10.7.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

images/ansible-operator/Pipfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,8 @@ ansible-runner = "==1.4.6"
88
ansible-runner-http = "==1.0.0"
99
ipaddress = "==1.0.23"
1010
openshift = "==0.11.2"
11-
ansible = "==2.10.7"
11+
ansible = "==2.9.15"
1212
jmespath = "==0.10.0"
13-
# cryptography needs to be pinned to 3.3.2 as this is the last version
14-
# before its setup requires rust, which is not available via RPM in the
15-
# base image. This pin should be re-evaluated once the base image is updated.
16-
cryptography = "==3.3.2"
1713

1814
[dev-packages]
1915

images/ansible-operator/Pipfile.lock

Lines changed: 11 additions & 74 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

images/ansible-operator/base.Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ RUN mkdir -p /etc/ansible \
1111
&& echo 'roles_path = /opt/ansible/roles' >> /etc/ansible/ansible.cfg \
1212
&& echo 'library = /usr/share/ansible/openshift' >> /etc/ansible/ansible.cfg
1313

14+
# Install python dependencies
15+
# Ensure fresh metadata rather than cached metadata in the base by running
16+
# yum clean all && rm -rf /var/yum/cache/* first
1417
# Copy python dependencies specs to be installed using Pipenv
1518
COPY Pipfile* ./
1619
# Instruct pip(env) not to keep a cache of installed packages,
@@ -19,10 +22,10 @@ COPY Pipfile* ./
1922
ENV PIP_NO_CACHE_DIR=1 \
2023
PIPENV_SYSTEM=1 \
2124
PIPENV_CLEAR=1
22-
# Ensure fresh metadata rather than cached metadata, install system and pip python deps,
23-
# and remove those not needed at runtime.
25+
# Ensure fresh metadata rather than cached metadata in the base by running
26+
# yum clean all && rm -rf /var/yum/cache/* first
2427
RUN yum clean all && rm -rf /var/cache/yum/* \
25-
&& yum update -y \
28+
&& yum -y update \
2629
&& yum install -y libffi-devel openssl-devel python38-devel gcc python38-pip python38-setuptools \
2730
&& pip3 install pipenv==2020.11.15 \
2831
&& pipenv install --deploy \

0 commit comments

Comments
 (0)