Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
117 changes: 7 additions & 110 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ LABEL io.k8s.display-name="Red Hat Ceph Storage 8 on RHEL 9"
LABEL io.openshift.tags="rhceph ceph"
LABEL io.k8s.description="Red Hat Ceph Storage 8"

COPY packages.txt .

# Escape char after immediately after RUN allows comment in first line
RUN \
# Install all components for the image, whether from packages or web downloads.
Expand All @@ -70,42 +72,7 @@ RUN \
# Installs should support install of ganesha for luminous
microdnf update -y --setopt=install_weak_deps=0 --nodocs && \
microdnf install -y --setopt=install_weak_deps=0 --nodocs util-linux python3-saml python3-setuptools udev device-mapper jq \
ca-certificates \
e2fsprogs \
ceph-common \
ceph-mon \
ceph-osd \
ceph-mds \
cephfs-mirror \
cephfs-top \
rbd-mirror \
ceph-mgr \
ceph-mgr-cephadm \
ceph-mgr-dashboard \
ceph-mgr-diskprediction-local \
ceph-mgr-k8sevents \
ceph-mgr-rook\
ceph-grafana-dashboards \
kmod \
lvm2 \
gdisk \
smartmontools \
nvme-cli \
libstoragemgmt \
systemd-udev \
sg3_utils \
procps-ng \
hostname \
ceph-radosgw libradosstriper1 \
nfs-ganesha nfs-ganesha-ceph nfs-ganesha-rgw nfs-ganesha-rados-grace nfs-ganesha-rados-urls gmonitoring nfs-ganesha-utils sssd-client dbus-daemon rpcbind \
\
\
\
ceph-immutable-object-cache \
\
ceph-volume \
ceph-exporter \
ceph-node-proxy \
$(cat packages.txt) \
&& \
echo '@ceph - memlock 204800' >> /etc/security/limits.conf && \
echo '@root - memlock 204800' >> /etc/security/limits.conf && \
Expand All @@ -117,43 +84,8 @@ ceph-mgr-rook\
echo 'Postinstall cleanup' && \
( microdnf clean all && \
rpm -q \
ca-certificates \
e2fsprogs \
ceph-common \
ceph-mon \
ceph-osd \
ceph-mds \
cephfs-mirror \
cephfs-top \
rbd-mirror \
ceph-mgr \
ceph-mgr-cephadm \
ceph-mgr-dashboard \
ceph-mgr-diskprediction-local \
ceph-mgr-k8sevents \
ceph-mgr-rook\
ceph-grafana-dashboards \
kmod \
lvm2 \
gdisk \
smartmontools \
nvme-cli \
libstoragemgmt \
systemd-udev \
sg3_utils \
procps-ng \
hostname \
ceph-radosgw libradosstriper1 \
nfs-ganesha nfs-ganesha-ceph nfs-ganesha-rgw nfs-ganesha-rados-grace nfs-ganesha-rados-urls gmonitoring nfs-ganesha-utils sssd-client dbus-daemon rpcbind \
\
\
\
ceph-immutable-object-cache \
\
ceph-volume \
ceph-exporter \
ceph-node-proxy \
&& \
$(cat packages.txt) \
&& \
rm -f /etc/profile.d/lang.sh ) && \
# Tweak some configuration files on the container system
# disable sync with udev since the container can not contact udev
Expand All @@ -180,41 +112,6 @@ find /var/log/ -type f -exec truncate -s 0 {} \; && \
#
# Verify that the packages installed haven't been accidentally cleaned
rpm -q \
ca-certificates \
e2fsprogs \
ceph-common \
ceph-mon \
ceph-osd \
ceph-mds \
cephfs-mirror \
cephfs-top \
rbd-mirror \
ceph-mgr \
ceph-mgr-cephadm \
ceph-mgr-dashboard \
ceph-mgr-diskprediction-local \
ceph-mgr-k8sevents \
ceph-mgr-rook\
ceph-grafana-dashboards \
kmod \
lvm2 \
gdisk \
smartmontools \
nvme-cli \
libstoragemgmt \
systemd-udev \
sg3_utils \
procps-ng \
hostname \
ceph-radosgw libradosstriper1 \
nfs-ganesha nfs-ganesha-ceph nfs-ganesha-rgw nfs-ganesha-rados-grace nfs-ganesha-rados-urls gmonitoring nfs-ganesha-utils sssd-client dbus-daemon rpcbind \
\
\
\
ceph-immutable-object-cache \
\
ceph-volume \
ceph-exporter \
ceph-node-proxy \
&& echo 'Packages verified successfully'
$(cat packages.txt) \
&& echo 'Packages verified successfully'

43 changes: 43 additions & 0 deletions packages.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
ca-certificates
ceph-common
ceph-exporter
ceph-grafana-dashboards
ceph-immutable-object-cache
ceph-mds
ceph-mgr
ceph-mgr-cephadm
ceph-mgr-dashboard
ceph-mgr-diskprediction-local
ceph-mgr-k8sevents
ceph-mgr-rook
ceph-mon
ceph-node-proxy
ceph-osd
ceph-radosgw
ceph-volume
cephfs-mirror
cephfs-top
dbus-daemon
e2fsprogs
gmonitoring
gdisk
hostname
kmod
libradosstriper1
libstoragemgmt
lvm2
nfs-ganesha
nfs-ganesha-ceph
nfs-ganesha-rados-grace
nfs-ganesha-rados-urls
nfs-ganesha-rgw
nfs-ganesha-utils
nvme-cli
procps-ng
rbd-mirror
rpcbind
sg3_utils
smartmontools
sssd-client
systemd-udev
tar