Skip to content

Commit ed14011

Browse files
committed
updating to ubi 9.6 and blocking python dependencies
Signed-off-by: Adam D. Cornett <adc@redhat.com>
1 parent 919b7ea commit ed14011

4 files changed

Lines changed: 138 additions & 159 deletions

File tree

images/ansible-operator/Dockerfile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# It is built with dependencies that take a while to download, thus speeding
33
# up ansible deploy jobs.
44

5-
FROM registry.access.redhat.com/ubi9/ubi:9.5 AS basebuilder
5+
FROM registry.access.redhat.com/ubi9/ubi:9.6 AS basebuilder
66

77
# Install Rust so that we can ensure backwards compatibility with installing/building the cryptography wheel across all platforms
88
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
@@ -27,15 +27,11 @@ RUN set -e && dnf clean all && rm -rf /var/cache/dnf/* \
2727
&& pip3 install --upgrade pip~=23.3.2 \
2828
&& pip3 install pipenv==2023.11.15 \
2929
&& pipenv install --deploy \
30-
# NOTE: This ignored vulnerability (71064) was detected in requests, \
31-
# but the upgraded version doesn't support the use case (protocol we are using).\
32-
# Ref: https://github.com/operator-framework/ansible-operator-plugins/pull/67#issuecomment-2189164688 \
33-
&& pipenv check --ignore 71064 \
3430
&& dnf remove -y gcc libffi-devel openssl-devel python3.12-devel \
3531
&& dnf clean all \
3632
&& rm -rf /var/cache/dnf
3733

38-
FROM registry.access.redhat.com/ubi9/ubi:9.5 AS base
34+
FROM registry.access.redhat.com/ubi9/ubi:9.6 AS base
3935
ARG TARGETARCH
4036

4137
# Label this image with the repo and commit that built it, for freshmaking purposes.

images/ansible-operator/Pipfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ name = "pypi"
77
ansible-runner = "~=2.4.0"
88
ansible-runner-http = "~=1.0.0"
99
ansible-core = "~=2.18.3"
10-
urllib3 = "~=1.26.2"
10+
urllib3 = "~=2.5.0"
1111
kubernetes = "==33.1.0"
12-
requests = "~=2.31.0"
12+
requests = "~=2.32.5"
1313

1414
[dev-packages]
1515

0 commit comments

Comments
 (0)