diff --git a/Dockerfile b/Dockerfile index 3f80079..030e5e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,6 +56,8 @@ LABEL summary="Provides the latest Red Hat Ceph Storage 5 on RHEL 8 in a fully f LABEL io.k8s.display-name="Red Hat Ceph Storage 5 on RHEL 8" LABEL io.openshift.tags="rhceph ceph" +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. @@ -64,38 +66,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 wget unzip util-linux python3-saml python3-setuptools udev device-mapper \ - ca-certificates \ - e2fsprogs \ - ceph-common \ - ceph-mon \ - ceph-osd \ - ceph-mds \ -cephfs-mirror \ - 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 \ - \ - ceph-radosgw libradosstriper1 \ - nfs-ganesha nfs-ganesha-ceph nfs-ganesha-rgw nfs-ganesha-rados-grace nfs-ganesha-rados-urls sssd-client \ - tcmu-runner ceph-iscsi \ - \ - \ - ceph-immutable-object-cache \ - \ - \ + $(cat packages.txt) \ && \ ln -s /usr/share/ceph/mgr/dashboard/frontend/dist-redhat /usr/share/ceph/mgr/dashboard/frontend/dist && \ # Clean container, starting with record of current size (strip / from end) @@ -106,38 +77,7 @@ ln -s /usr/share/ceph/mgr/dashboard/frontend/dist-redhat /usr/share/ceph/mgr/das echo 'Postinstall cleanup' && \ ( microdnf clean all && \ rpm -q \ - ca-certificates \ - e2fsprogs \ - ceph-common \ - ceph-mon \ - ceph-osd \ - ceph-mds \ -cephfs-mirror \ - 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 \ - \ - ceph-radosgw libradosstriper1 \ - nfs-ganesha nfs-ganesha-ceph nfs-ganesha-rgw nfs-ganesha-rados-grace nfs-ganesha-rados-urls sssd-client \ - tcmu-runner ceph-iscsi \ - \ - \ - ceph-immutable-object-cache \ - \ - \ + $(cat packages.txt) \ && \ rm -f /etc/profile.d/lang.sh ) && \ # Tweak some configuration files on the container system @@ -161,38 +101,7 @@ 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 \ - 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 \ - \ - ceph-radosgw libradosstriper1 \ - nfs-ganesha nfs-ganesha-ceph nfs-ganesha-rgw nfs-ganesha-rados-grace nfs-ganesha-rados-urls sssd-client \ - tcmu-runner ceph-iscsi \ - \ - \ - ceph-immutable-object-cache \ - \ - \ + $(cat packages.txt) \ && echo 'Packages verified successfully' #====================================================== # Add ceph-container files diff --git a/packages.txt b/packages.txt new file mode 100644 index 0000000..d5d0388 --- /dev/null +++ b/packages.txt @@ -0,0 +1,36 @@ +ca-certificates +ceph-common +ceph-exporter +ceph-grafana-dashboards +ceph-immutable-object-cache +ceph-iscsi +ceph-mds +ceph-mgr +ceph-mgr-cephadm +ceph-mgr-dashboard +ceph-mgr-diskprediction-local +ceph-mgr-k8sevents +ceph-mgr-rook +ceph-mon +ceph-osd +ceph-radosgw +cephfs-mirror +e2fsprogs +gdisk +kmod +libradosstriper1 +libstoragemgmt +lvm2 +nfs-ganesha +nfs-ganesha-ceph +nfs-ganesha-rados-grace +nfs-ganesha-rados-urls +nfs-ganesha-rgw +nvme-cli +rbd-mirror +sg3_utils +smartmontools +sssd-client +systemd-udev +tar +tcmu-runner \ No newline at end of file