From 7191a7be0d25f5aa3c6211a602b87bb20ba0f78f Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Thu, 22 Apr 2021 13:26:03 -0400 Subject: [PATCH] centos/ubi: disable weak dependencies The weak dependencies were already disable for ubi8 so we can do this for CentOS too (even if we don't have the same weak deps during the ceph packages between upstream and downstream ceph install). This also disables the weak deps during the container image update and daemon package install step. On the daemon-base image this reduces the container image size by 30MB uncompressed. Closes: #1874 Signed-off-by: Dimitri Savineau (cherry picked from commit 6c8af8169a3b4a49abf72e72eb897df5ae3d1e9e) --- ceph-releases/ALL/centos/8/daemon/__DOCKERFILE_INSTALL__ | 4 ++-- ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__ | 4 ++-- ceph-releases/ALL/centos/daemon/__DOCKERFILE_INSTALL__ | 4 ++-- ceph-releases/ALL/ubi8/daemon-base/__DOCKERFILE_INSTALL__ | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ceph-releases/ALL/centos/8/daemon/__DOCKERFILE_INSTALL__ b/ceph-releases/ALL/centos/8/daemon/__DOCKERFILE_INSTALL__ index 7982d539e..fbb88cc4a 100644 --- a/ceph-releases/ALL/centos/8/daemon/__DOCKERFILE_INSTALL__ +++ b/ceph-releases/ALL/centos/8/daemon/__DOCKERFILE_INSTALL__ @@ -1,6 +1,6 @@ echo 'Install packages' && \ - yum install -y wget unzip util-linux python3-setuptools udev device-mapper && \ - yum install -y --enablerepo=powertools __DAEMON_PACKAGES__ && \ + yum install -y --setopt=install_weak_deps=False wget unzip util-linux python3-setuptools udev device-mapper && \ + yum install -y --setopt=install_weak_deps=False --enablerepo=powertools __DAEMON_PACKAGES__ && \ # Centos 8 doesn't have confd/forego/etcdctl/kubectl packages, so install them from web __WEB_INSTALL_CONFD__ && \ __WEB_INSTALL_ETCDCTL__ && \ diff --git a/ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__ b/ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__ index 669e4d7a8..bd6a827d8 100644 --- a/ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__ +++ b/ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__ @@ -42,7 +42,7 @@ bash -c ' \ curl -s -L https://download.ceph.com/ceph-iscsi/2/rpm/el__ENV_[BASEOS_TAG]__/ceph-iscsi.repo -o /etc/yum.repos.d/ceph-iscsi.repo ; \ fi ; \ fi' && \ -yum update -y && \ +yum update -y --setopt=install_weak_deps=False && \ rpm --import 'https://download.ceph.com/keys/release.asc' && \ if [[ "${CEPH_VERSION}" == nautilus ]]; then \ CEPH_MGR_K8SEVENTS="ceph-mgr-k8sevents__ENV_[CEPH_POINT_RELEASE]__"; \ @@ -66,4 +66,4 @@ bash -c ' \ yum install -y dnf-plugins-core ; \ yum copr enable -y tchaikov/python-scikit-learn ; \ fi ' && \ -yum install -y __CEPH_BASE_PACKAGES__ +yum install -y --setopt=install_weak_deps=False __CEPH_BASE_PACKAGES__ diff --git a/ceph-releases/ALL/centos/daemon/__DOCKERFILE_INSTALL__ b/ceph-releases/ALL/centos/daemon/__DOCKERFILE_INSTALL__ index 3eef77178..4ed7c7490 100644 --- a/ceph-releases/ALL/centos/daemon/__DOCKERFILE_INSTALL__ +++ b/ceph-releases/ALL/centos/daemon/__DOCKERFILE_INSTALL__ @@ -1,6 +1,6 @@ echo 'Install packages' && \ - yum install -y wget unzip util-linux python-setuptools udev device-mapper && \ - yum install -y __DAEMON_PACKAGES__ && \ + yum install -y --setopt=install_weak_deps=False wget unzip util-linux python-setuptools udev device-mapper && \ + yum install -y --setopt=install_weak_deps=False __DAEMON_PACKAGES__ && \ # Centos 7 doesn't have confd/forego packages, so install them from web __WEB_INSTALL_CONFD__ && \ __WEB_INSTALL_FOREGO__ diff --git a/ceph-releases/ALL/ubi8/daemon-base/__DOCKERFILE_INSTALL__ b/ceph-releases/ALL/ubi8/daemon-base/__DOCKERFILE_INSTALL__ index dcb765b1c..6dacb8c0f 100644 --- a/ceph-releases/ALL/ubi8/daemon-base/__DOCKERFILE_INSTALL__ +++ b/ceph-releases/ALL/ubi8/daemon-base/__DOCKERFILE_INSTALL__ @@ -1,3 +1,3 @@ -yum update -y && \ -yum install -y wget unzip util-linux python3-saml python3-setuptools udev device-mapper && \ -yum install -y __CEPH_BASE_PACKAGES__ +yum update -y --setopt=install_weak_deps=False && \ +yum install -y --setopt=install_weak_deps=False wget unzip util-linux python3-saml python3-setuptools udev device-mapper && \ +yum install -y --setopt=install_weak_deps=False __CEPH_BASE_PACKAGES__