Skip to content

Commit

Permalink
centos/ubi: disable weak dependencies
Browse files Browse the repository at this point in the history
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 <[email protected]>
(cherry picked from commit 6c8af81)
  • Loading branch information
dsavineau committed May 7, 2021
1 parent fd48df5 commit 7191a7b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions ceph-releases/ALL/centos/8/daemon/__DOCKERFILE_INSTALL__
Original file line number Diff line number Diff line change
@@ -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__ && \
Expand Down
4 changes: 2 additions & 2 deletions ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__
Original file line number Diff line number Diff line change
Expand Up @@ -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]__"; \
Expand All @@ -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__
4 changes: 2 additions & 2 deletions ceph-releases/ALL/centos/daemon/__DOCKERFILE_INSTALL__
Original file line number Diff line number Diff line change
@@ -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__
6 changes: 3 additions & 3 deletions ceph-releases/ALL/ubi8/daemon-base/__DOCKERFILE_INSTALL__
Original file line number Diff line number Diff line change
@@ -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__

0 comments on commit 7191a7b

Please sign in to comment.