un-uniquify __DOCKERFILE_POSTINSTALL_CLEANUP__ for centos 8/9.

There was a non-release-version-specific version present, but being ignored. Signed-off-by: Dan Mick <dmick@redhat.com>
kshtsk · Mar 7, 2024 · 765eaa0 · 765eaa0
1 parent 4f2fe24
commit 765eaa0
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 14 deletions.
diff --git a/ceph-releases/ALL/centos-arm64/8/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__ b/ceph-releases/ALL/centos-arm64/8/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__
diff --git a/ceph-releases/ALL/centos-arm64/9/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__ b/ceph-releases/ALL/centos-arm64/9/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__
diff --git a/ceph-releases/ALL/centos-arm64/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__ b/ceph-releases/ALL/centos-arm64/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__
diff --git a/ceph-releases/ALL/centos-arm64/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__ b/ceph-releases/ALL/centos-arm64/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__
@@ -0,0 +1,4 @@
+echo 'Postinstall cleanup' && \
+ (rm -rf "/usr/bin/hyperkube /usr/bin/etcd /usr/bin/systemd-analyze /usr/share/hwdata/{iab.txt,oui.txt} /etc/profile.d/lang.sh" && \
+   yum clean all && \
+   rpm -q __CEPH_BASE_PACKAGES__ )
diff --git a/ceph-releases/ALL/centos/8/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__ b/ceph-releases/ALL/centos/8/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__
diff --git a/ceph-releases/ALL/centos/9/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__ b/ceph-releases/ALL/centos/9/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__
diff --git a/ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__ b/ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__
@@ -1,6 +1,4 @@
 echo 'Postinstall cleanup' && \
  (rm -rf "/usr/bin/hyperkube /usr/bin/etcd /usr/bin/systemd-analyze /usr/share/hwdata/{iab.txt,oui.txt} /etc/profile.d/lang.sh" && \
    yum clean all && \
-   rpmdb --rebuilddb && \
-   rpm -q __CEPH_BASE_PACKAGES__ && \
-   yum-config-manager --disable ceph-iscsi ceph-iscsi-source ceph-iscsi-noarch tcmu-runner tcmu-runner-noarch tcmu-runner-source)
+   rpm -q __CEPH_BASE_PACKAGES__ )