Skip to content

Test with base-rhel9-minimal-test #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sdodson wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Test with base-rhel9-minimal-test #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18092ce
Test with base-rhel9-minimal-test
sdodson Nov 25, 2025
f187011
microdnf: use 0 rather than False
sdodson Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion base/Dockerfile.rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN INSTALL_PKGS=" \
" && \
if [ ! -e /usr/bin/yum ]; then ln -s /usr/bin/microdnf /usr/bin/yum; fi && \
echo 'skip_missing_names_on_install=0' >> /etc/yum.conf && \
yum install -y --setopt=tsflags=nodocs --setopt=install_weak_deps=False ${INSTALL_PKGS} && \
yum install -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 ${INSTALL_PKGS} && \
( test -e /usr/bin/python || alternatives --set python /usr/bin/python3 ) && \
yum clean all && rm -rf /var/cache/*

Expand Down
6 changes: 3 additions & 3 deletions base/Dockerfile.rhel9
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
FROM registry.ci.openshift.org/ocp/4.21:base-rhel9-minimal-test

# A ubi9 image will expose python3 as /usr/bin/python. It does not contain
# python2. Subsequent layers should install if it needed.
Expand All @@ -12,13 +12,13 @@ RUN INSTALL_PKGS=" \
procps-ng rsync iproute diffutils python3 \
python-unversioned-command util-linux dbus systemd subscription-manager" && \
echo 'skip_missing_names_on_install=0' >> /etc/yum.conf && \
dnf install -y --nodocs --setopt=install_weak_deps=False ${INSTALL_PKGS} && \
dnf install -y --nodocs --setopt=install_weak_deps=0 ${INSTALL_PKGS} && \
dnf clean all && rm -rf /var/cache/*

# OKD-specific changes
RUN source /etc/os-release && [ "${ID}" != "centos" ] && exit 0; \
INSTALL_PKGS="dnf-plugins-core centos-release-nfv-openvswitch centos-release-openstack-zed" && \
dnf install -y --nodocs --setopt=install_weak_deps=False ${INSTALL_PKGS} && \
dnf install -y --nodocs --setopt=install_weak_deps=0 ${INSTALL_PKGS} && \
dnf config-manager --set-enabled rt && \
dnf clean all && rm -rf /var/cache/*

Expand Down
2 changes: 1 addition & 1 deletion egress/dns-proxy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# The standard name for this image is openshift/origin-egress-dns-proxy

FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
FROM registry.ci.openshift.org/ocp/4.21:base-rhel9-minimal-test

# HAProxy 1.6+ version is needed to leverage DNS resolution at runtime.
RUN INSTALL_PKGS="haproxy28 rsyslog" && \
Expand Down
2 changes: 1 addition & 1 deletion egress/http-proxy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# The standard name for this image is openshift/origin-egress-http-proxy

FROM registry.ci.openshift.org/ocp/4.20:base-rhel9
FROM registry.ci.openshift.org/ocp/4.20:base-rhel9-minimal-test

RUN INSTALL_PKGS="squid" && \
yum install -y $INSTALL_PKGS && \
Expand Down
2 changes: 1 addition & 1 deletion ipfailover/keepalived/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# ImageName: openshift/origin-keepalived-ipfailover
#
FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
FROM registry.ci.openshift.org/ocp/4.21:base-rhel9-minimal-test

RUN INSTALL_PKGS="kmod keepalived iproute psmisc nmap-ncat net-tools ipset ipset-libs procps-ng" && \
yum install -y $INSTALL_PKGS && \
Expand Down