1
0
mirror of https://github.com/openshift/openshift-ansible.git synced 2026-02-05 06:46:04 +01:00

Merge pull request #12507 from openshift-cherrypick-robot/cherry-pick-12503-to-release-4.16

[release-4.16] OCPBUGS-38627: Update Dockerfile to centos9 stream.
This commit is contained in:
openshift-merge-bot[bot]
2024-08-27 14:46:19 +00:00
committed by GitHub
3 changed files with 7 additions and 4 deletions

View File

@@ -1,4 +1,4 @@
FROM quay.io/centos/centos:stream8
FROM quay.io/centos/centos:stream9
MAINTAINER OpenShift Team <dev@lists.openshift.redhat.com>
@@ -30,12 +30,15 @@ RUN yum install -y epel-release 'dnf-command(config-manager)' && \
openshift-ansible-test && \
yum clean all
RUN unlink /usr/bin/python3
RUN ln -s /usr/bin/python3.11 /usr/bin/python3
# Add a symlink to pip3.x.
# Any future use of pip3 can be used after this link is set, rather than specifically calling pip3.x.
RUN ln -s /usr/bin/pip3.11 /usr/bin/pip3
# for ec2_ami_info (in workers-rhel-aws-provision CI step) which requires boto3
RUN pip3 install --no-cache-dir boto3 botocore ansible-core
RUN pip3 install --no-cache-dir boto3 botocore 'ansible-core<2.17'
# ansible-galaxy will not be available until ansible-core is installed
RUN ansible-galaxy collection install -p /usr/share/ansible/collections amazon.aws && \

View File

@@ -2,7 +2,7 @@ ORIGIN-ANSIBLE IMAGE INSTALLER
===============================
Contains Dockerfile information for building an openshift/origin-ansible image
based on `quay.io/centos/centos:stream8` or `registry.access.redhat.com/ubi8`.
based on `quay.io/centos/centos:stream9` or `registry.access.redhat.com/ubi9`.
Read additional setup information for this image at: https://hub.docker.com/r/openshift/origin-ansible/

View File

@@ -1,3 +1,3 @@
# Versions are pinned to prevent pypi releases arbitrarily breaking
# tests with new APIs/semantics. We want to update versions deliberately.
ansible-core
ansible-core<2.17