ubi9: clean up

This moves the file at `ceph-releases/ALL/ubi9-ibm/__DOCKERFILE_BRANDING__` to `ceph-releases/quincy/ubi9-ibm/__DOCKERFILE_BRANDING__` because it is specific to a particular release. Also, this removes some duplicate files. Signed-off-by: Guillaume Abrioux <[email protected]>
ceph · Jul 18, 2023 · 50dc1dd · 50dc1dd
1 parent 69c2911
commit 50dc1dd
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 11 deletions.
diff --git a/...ases/ALL/ubi9-ibm/__DOCKERFILE_BRANDING__ → ...s/quincy/ubi9-ibm/__DOCKERFILE_BRANDING__ b/...ases/ALL/ubi9-ibm/__DOCKERFILE_BRANDING__ → ...s/quincy/ubi9-ibm/__DOCKERFILE_BRANDING__
diff --git a/ceph-releases/quincy/ubi9-ibm/__DOCKERFILE_CLEAN_COMMON__ b/ceph-releases/quincy/ubi9-ibm/__DOCKERFILE_CLEAN_COMMON__
diff --git a/ceph-releases/quincy/ubi9-redhat/__DOCKERFILE_CLEAN_COMMON__ b/ceph-releases/quincy/ubi9-redhat/__DOCKERFILE_CLEAN_COMMON__
diff --git a/ceph-releases/quincy/ubi9-redhat/__DOCKERFILE_MAINTAINER__ b/ceph-releases/quincy/ubi9-redhat/__DOCKERFILE_MAINTAINER__
diff --git a/ceph-releases/reef/ubi9-ibm/__DOCKERFILE_BRANDING__ b/ceph-releases/reef/ubi9-ibm/__DOCKERFILE_BRANDING__
@@ -1,10 +1,10 @@
 ln -s /usr/share/ceph/mgr/dashboard/frontend/dist-ibm /usr/share/ceph/mgr/dashboard/frontend/dist && \
 sed -i \
   -e "s|registry.redhat.io/rhceph/rhceph-7-rhel9:latest|cp.icr.io/cp/ibm-ceph/ceph-7-rhel9:latest|" \
-  -e "s|registry.redhat.io/openshift4/ose-prometheus:v4.10|cp.icr.io/cp/ibm-ceph/prometheus:v4.10|" \
-  -e "s|registry.redhat.io/openshift4/ose-prometheus-node-exporter:v4.10|cp.icr.io/cp/ibm-ceph/prometheus-node-exporter:v4.10|" \
+  -e "s|registry.redhat.io/openshift4/ose-prometheus:|cp.icr.io/cp/ibm-ceph/prometheus:|" \
+  -e "s|registry.redhat.io/openshift4/ose-prometheus-node-exporter:|cp.icr.io/cp/ibm-ceph/prometheus-node-exporter:|" \
   -e "s|registry.redhat.io/rhceph/rhceph-7-dashboard-rhel9:latest|cp.icr.io/cp/ibm-ceph/ceph-7-dashboard-rhel9:latest|" \
-  -e "s|registry.redhat.io/openshift4/ose-prometheus-alertmanager:v4.10|cp.icr.io/cp/ibm-ceph/prometheus-alertmanager:v4.10|" \
+  -e "s|registry.redhat.io/openshift4/ose-prometheus-alertmanager:|cp.icr.io/cp/ibm-ceph/prometheus-alertmanager:|" \
   -e "s|registry.redhat.io/rhceph/rhceph-haproxy-rhel9:latest|cp.icr.io/cp/ibm-ceph/haproxy-rhel9:latest|" \
   -e "s|registry.redhat.io/rhceph/keepalived-rhel9:latest|cp.icr.io/cp/ibm-ceph/keepalived-rhel9:latest|" \
   -e "s|registry.redhat.io/rhceph/snmp-notifier-rhel9:latest|cp.icr.io/cp/ibm-ceph/snmp-notifier-rhel9:latest|" \

diff --git a/ceph-releases/reef/ubi9-redhat/__DOCKERFILE_CLEAN_COMMON__ b/ceph-releases/reef/ubi9-redhat/__DOCKERFILE_CLEAN_COMMON__
diff --git a/ceph-releases/reef/ubi9-redhat/__DOCKERFILE_MAINTAINER__ b/ceph-releases/reef/ubi9-redhat/__DOCKERFILE_MAINTAINER__