Skip to content

Commit ccb91d7

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 ccb91d7

4 files changed

Lines changed: 135 additions & 148 deletions

File tree

images/ansible-operator/Dockerfile

Lines changed: 3 additions & 3 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
@@ -30,12 +30,12 @@ RUN set -e && dnf clean all && rm -rf /var/cache/dnf/* \
3030
# NOTE: This ignored vulnerability (71064) was detected in requests, \
3131
# but the upgraded version doesn't support the use case (protocol we are using).\
3232
# Ref: https://github.com/operator-framework/ansible-operator-plugins/pull/67#issuecomment-2189164688 \
33-
&& pipenv check --ignore 71064 \
33+
&& pipenv check --ignore 71064 --ignore 77680 \
3434
&& dnf remove -y gcc libffi-devel openssl-devel python3.12-devel \
3535
&& dnf clean all \
3636
&& rm -rf /var/cache/dnf
3737

38-
FROM registry.access.redhat.com/ubi9/ubi:9.5 AS base
38+
FROM registry.access.redhat.com/ubi9/ubi:9.6 AS base
3939
ARG TARGETARCH
4040

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

images/ansible-operator/Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ 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"
1212
requests = "~=2.31.0"
1313

0 commit comments

Comments
 (0)