Skip to content

OCPBUGS-84344: yum.conf: omit docs, weak deps #231

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 1 commit into
base: master
Choose a base branch
from
Open

OCPBUGS-84344: yum.conf: omit docs, weak deps #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ RUN INSTALL_PKGS=" \
iproute \
" && \
echo 'skip_missing_names_on_install=0' >> /etc/yum.conf && \
echo 'install_weak_deps=0' >> /etc/yum.conf && \
echo 'tsflags=nodocs' >> /etc/yum.conf && \
yum install -y ${INSTALL_PKGS} && \
yum clean all && \
mkdir -p /var/lib/origin
Expand Down
2 changes: 2 additions & 0 deletions base/Dockerfile.centos7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ RUN INSTALL_PKGS=" \
iproute \
" && \
echo 'skip_missing_names_on_install=0' >> /etc/yum.conf && \
echo 'install_weak_deps=0' >> /etc/yum.conf && \
echo 'tsflags=nodocs' >> /etc/yum.conf && \
yum install -y ${INSTALL_PKGS} && \
yum clean all && \
mkdir -p /var/lib/origin
Expand Down
4 changes: 3 additions & 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,9 @@ 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} && \
echo 'install_weak_deps=0' >> /etc/yum.conf && \
echo 'tsflags=nodocs' >> /etc/yum.conf && \
yum install -y ${INSTALL_PKGS} && \
( test -e /usr/bin/python || alternatives --set python /usr/bin/python3 ) && \
yum clean all && rm -rf /var/cache/*

Expand Down
2 changes: 2 additions & 0 deletions base/Dockerfile.rhel7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ RUN INSTALL_PKGS=" \
iproute \
" && \
echo 'skip_missing_names_on_install=0' >> /etc/yum.conf && \
echo 'install_weak_deps=0' >> /etc/yum.conf && \
echo 'tsflags=nodocs' >> /etc/yum.conf && \
yum --disablerepo=origin-local-release install -y $INSTALL_PKGS && \
yum clean all && \
mkdir -p /var/lib/origin
Expand Down
7 changes: 4 additions & 3 deletions base/Dockerfile.rhel9
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,22 @@ RUN INSTALL_PKGS=" \
python-unversioned-command util-linux" && \
echo 'skip_missing_names_on_install=0' >> /etc/yum.conf && \
echo 'install_weak_deps=0' >> /etc/yum.conf && \
dnf install -y --nodocs ${INSTALL_PKGS} && \
echo 'tsflags=nodocs' >> /etc/yum.conf && \
dnf install -y ${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" && \
[ "${VERSION_ID}" = "9" ] && INSTALL_PKGS="${INSTALL_PKGS} centos-release-openstack-zed"; \
dnf install -y --nodocs --setopt=install_weak_deps=False ${INSTALL_PKGS} && \
dnf install -y ${INSTALL_PKGS} && \
dnf config-manager --set-enabled rt && \
dnf clean all && rm -rf /var/cache/*; \
[ "${VERSION_ID}" = "10" ] && \
curl -o /etc/yum.repos.d/delorean.repo https://trunk.rdoproject.org/centos10-master/podified-ci-testing/delorean.repo && \
curl -o /etc/yum.repos.d/delorean-deps.repo https://trunk.rdoproject.org/centos10-master/delorean-deps.repo && \
# gpgme removed from ubi10-minimal, was in ubi9-minimal required by all builds with github.com/proglottis/gpgme
dnf install -y --nodocs --setopt=install_weak_deps=False gpgme && \
dnf install -y gpgme && \
dnf clean all && rm -rf /var/cache/* || true

# Enable x509 common name matching for golang 1.15 and beyond.
Expand Down