diff --git a/.github/workflows/rhcs.yml b/.github/workflows/rhcs.yml index fd49032ca..e5a6b4e47 100644 --- a/.github/workflows/rhcs.yml +++ b/.github/workflows/rhcs.yml @@ -8,13 +8,37 @@ jobs: uses: actions/checkout@v2 - name: compose the RHCS 5 container image - run: VERSION=5 CEPH_RELEASE=pacific ./contrib/compose-rhcs.sh + run: BRANDING=redhat VERSION=5 CEPH_RELEASE=pacific ./contrib/compose-rhcs.sh + + - name: validate description pattern in Dockerfile + run: grep 'description="Red Hat Ceph Storage 5"' staging/pacific-ubi8-redhat-latest-x86_64/composed/Dockerfile - name: compose the RHCS 6 container image - run: VERSION=6 CEPH_RELEASE=quincy ./contrib/compose-rhcs.sh + run: BRANDING=redhat VERSION=6 CEPH_RELEASE=quincy ./contrib/compose-rhcs.sh + + - name: validate description pattern in Dockerfile + run: grep 'description="Red Hat Ceph Storage 6"' staging/quincy-ubi9-redhat-latest-x86_64/composed/Dockerfile - name: compose the RHCS 7 container image - run: VERSION=7 CEPH_RELEASE=reef ./contrib/compose-rhcs.sh + run: BRANDING=redhat VERSION=7 CEPH_RELEASE=reef ./contrib/compose-rhcs.sh + + - name: validate rhcs 7 description pattern in Dockerfile + run: grep 'description="Red Hat Ceph Storage 7"' staging/reef-ubi9-redhat-latest-x86_64/composed/Dockerfile + + - name: compose the IBM Ceph 7 container image + run: BRANDING=ibm VERSION=7 CEPH_RELEASE=reef ./contrib/compose-rhcs.sh + + - name: validate IBM Ceph 7 description pattern in Dockerfile + run: grep 'description="IBM Storage Ceph 7"' staging/reef-ubi9-ibm-latest-x86_64/composed/Dockerfile - name: compose the RHCS 8 container image - run: VERSION=8 CEPH_RELEASE=squid ./contrib/compose-rhcs.sh + run: BRANDING=redhat VERSION=8 CEPH_RELEASE=squid ./contrib/compose-rhcs.sh + + - name: validate rhcs 8 description pattern in Dockerfile + run: grep 'description="Red Hat Ceph Storage 8"' staging/squid-ubi9-redhat-latest-x86_64/composed/Dockerfile + + - name: compose the IBM Ceph 8 container image + run: BRANDING=ibm VERSION=8 CEPH_RELEASE=squid ./contrib/compose-rhcs.sh + + - name: validate ibm ceph 8 description pattern in Dockerfile + run: grep 'description="IBM Storage Ceph 8"' staging/squid-ubi9-ibm-latest-x86_64/composed/Dockerfile diff --git a/ceph-releases/squid/centos-arm64/__CEPH_NODE_PROXY_PACKAGE__ b/ceph-releases/squid/centos-arm64/__CEPH_NODE_PROXY_PACKAGE__ new file mode 100644 index 000000000..e69de29bb diff --git a/ceph-releases/squid/centos-arm64/__GANESHA_PACKAGES__ b/ceph-releases/squid/centos-arm64/__GANESHA_PACKAGES__ new file mode 120000 index 000000000..e49c75779 --- /dev/null +++ b/ceph-releases/squid/centos-arm64/__GANESHA_PACKAGES__ @@ -0,0 +1 @@ +../../../src/daemon-base/__GANESHA_PACKAGES__ \ No newline at end of file diff --git a/ceph-releases/squid/centos/__CEPH_NODE_PROXY_PACKAGE__ b/ceph-releases/squid/centos/__CEPH_NODE_PROXY_PACKAGE__ new file mode 100644 index 000000000..e69de29bb diff --git a/ceph-releases/squid/centos/__GANESHA_PACKAGES__ b/ceph-releases/squid/centos/__GANESHA_PACKAGES__ new file mode 100644 index 000000000..e16becb75 --- /dev/null +++ b/ceph-releases/squid/centos/__GANESHA_PACKAGES__ @@ -0,0 +1 @@ +nfs-ganesha-5.5-1.el__ENV_[DISTRO_VERSION]__s nfs-ganesha-ceph-5.5-1.el__ENV_[DISTRO_VERSION]__s nfs-ganesha-rgw-5.5-1.el__ENV_[DISTRO_VERSION]__s nfs-ganesha-rados-grace-5.5-1.el__ENV_[DISTRO_VERSION]__s nfs-ganesha-rados-urls-5.5-1.el__ENV_[DISTRO_VERSION]__s sssd-client dbus-daemon rpcbind diff --git a/ceph-releases/squid/ubi9-ibm/__DOCKERFILE_BRANDING__ b/ceph-releases/squid/ubi9-ibm/__DOCKERFILE_BRANDING__ new file mode 100644 index 000000000..85e41b3ac --- /dev/null +++ b/ceph-releases/squid/ubi9-ibm/__DOCKERFILE_BRANDING__ @@ -0,0 +1,15 @@ +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-8-rhel9:|cp.icr.io/cp/ibm-ceph/ceph-8-rhel9:|" \ + -e "s|registry.redhat.io/openshift4/ose-prometheus:|cp.icr.io/cp/ibm-ceph/prometheus:|" \ + -e "s|registry.redhat.io/openshift-logging/logging-loki-rhel8:|cp.icr.io/cp/ibm-ceph/logging-loki-rhel8:|" \ + -e "s|registry.redhat.io/rhceph/rhceph-promtail-rhel9:|cp.icr.io/cp/ibm-ceph/promtail-rhel9:|" \ + -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/grafana-rhel9:|cp.icr.io/cp/ibm-ceph/grafana-rhel9:|" \ + -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:|cp.icr.io/cp/ibm-ceph/haproxy-rhel9:|" \ + -e "s|registry.redhat.io/rhceph/keepalived-rhel9:|cp.icr.io/cp/ibm-ceph/keepalived-rhel9:|" \ + -e "s|registry.redhat.io/rhceph/snmp-notifier-rhel9:|cp.icr.io/cp/ibm-ceph/snmp-notifier-rhel9:|" \ + -e "s|registry.redhat.io/rhceph/ceph-nvmeof-rhel9:|cp.icr.io/cp/ibm-ceph/nvmeof-rhel9:|" \ + -e "s|default='registry.redhat.io'|default='cp.icr.io'|" \ + /usr/share/ceph/mgr/cephadm/module.py && \ diff --git a/ceph-releases/squid/ubi9-ibm/daemon-base/__CRIMSON_PACKAGES__ b/ceph-releases/squid/ubi9-ibm/daemon-base/__CRIMSON_PACKAGES__ new file mode 100644 index 000000000..e69de29bb diff --git a/ceph-releases/squid/ubi9-ibm/daemon-base/__CSI_PACKAGES__ b/ceph-releases/squid/ubi9-ibm/daemon-base/__CSI_PACKAGES__ new file mode 100644 index 000000000..e69de29bb diff --git a/ceph-releases/squid/ubi9-ibm/daemon-base/__DOCKERFILE_INSTALL__ b/ceph-releases/squid/ubi9-ibm/daemon-base/__DOCKERFILE_INSTALL__ new file mode 100644 index 000000000..c03bf5d25 --- /dev/null +++ b/ceph-releases/squid/ubi9-ibm/daemon-base/__DOCKERFILE_INSTALL__ @@ -0,0 +1,2 @@ +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 __CEPH_BASE_PACKAGES__ \ No newline at end of file diff --git a/ceph-releases/squid/ubi9-ibm/daemon-base/__DOCKERFILE_LABELS__ b/ceph-releases/squid/ubi9-ibm/daemon-base/__DOCKERFILE_LABELS__ new file mode 100644 index 000000000..fa773f088 --- /dev/null +++ b/ceph-releases/squid/ubi9-ibm/daemon-base/__DOCKERFILE_LABELS__ @@ -0,0 +1,10 @@ +# Atomic specific labels +LABEL version="8" + +# Build specific labels +LABEL com.redhat.component="ibm-ceph-container" +LABEL name="ibm-ceph" +LABEL description="IBM Storage Ceph 8" +LABEL summary="Provides the latest IBM Storage Ceph 8 in a fully featured and supported base image." +LABEL io.k8s.display-name="IBM Storage Ceph 8" +LABEL io.openshift.tags="ibm ceph" diff --git a/ceph-releases/squid/ubi9-ibm/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__ b/ceph-releases/squid/ubi9-ibm/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__ new file mode 100644 index 000000000..b8b5033b9 --- /dev/null +++ b/ceph-releases/squid/ubi9-ibm/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__ @@ -0,0 +1,4 @@ +echo 'Postinstall cleanup' && \ + ( microdnf clean all && \ + rpm -q __CEPH_BASE_PACKAGES__ && \ + rm -f /etc/profile.d/lang.sh ) diff --git a/ceph-releases/squid/ubi9-ibm/daemon-base/__DOCKERFILE_PREINSTALL__ b/ceph-releases/squid/ubi9-ibm/daemon-base/__DOCKERFILE_PREINSTALL__ new file mode 100644 index 000000000..31f615464 --- /dev/null +++ b/ceph-releases/squid/ubi9-ibm/daemon-base/__DOCKERFILE_PREINSTALL__ @@ -0,0 +1 @@ +RUN rm -f /etc/yum.repos.d/ubi.repo diff --git a/ceph-releases/squid/ubi9-ibm/daemon-base/__DOCKERFILE_VERIFY_PACKAGES__ b/ceph-releases/squid/ubi9-ibm/daemon-base/__DOCKERFILE_VERIFY_PACKAGES__ new file mode 100644 index 000000000..0fea829cc --- /dev/null +++ b/ceph-releases/squid/ubi9-ibm/daemon-base/__DOCKERFILE_VERIFY_PACKAGES__ @@ -0,0 +1 @@ +rpm -q __CEPH_BASE_PACKAGES__ diff --git a/ceph-releases/squid/ubi9-ibm/daemon-base/__ETC_REDHAT_STORAGE_RELEASE__ b/ceph-releases/squid/ubi9-ibm/daemon-base/__ETC_REDHAT_STORAGE_RELEASE__ new file mode 100644 index 000000000..a20fa84e1 --- /dev/null +++ b/ceph-releases/squid/ubi9-ibm/daemon-base/__ETC_REDHAT_STORAGE_RELEASE__ @@ -0,0 +1,2 @@ +# Editing /etc/redhat-storage-server release file +RUN echo "IBM Storage Ceph 8 (Container)" > /etc/redhat-storage-release diff --git a/ceph-releases/squid/ubi9-ibm/daemon-base/__IBM_ACCEPT_EULA__ b/ceph-releases/squid/ubi9-ibm/daemon-base/__IBM_ACCEPT_EULA__ new file mode 100644 index 000000000..1e1a942a6 --- /dev/null +++ b/ceph-releases/squid/ubi9-ibm/daemon-base/__IBM_ACCEPT_EULA__ @@ -0,0 +1 @@ +ENV ACCEPT_EULA YES \ No newline at end of file diff --git a/ceph-releases/squid/ubi9-ibm/daemon-base/__RADOSGW_PACKAGES__ b/ceph-releases/squid/ubi9-ibm/daemon-base/__RADOSGW_PACKAGES__ new file mode 100644 index 000000000..4879dadf9 --- /dev/null +++ b/ceph-releases/squid/ubi9-ibm/daemon-base/__RADOSGW_PACKAGES__ @@ -0,0 +1 @@ +ceph-radosgw__ENV_[CEPH_POINT_RELEASE]__ libradosstriper1__ENV_[CEPH_POINT_RELEASE]__ diff --git a/ceph-releases/squid/ubi9-ibm/daemon-base/__SCIKIT_LEARN__ b/ceph-releases/squid/ubi9-ibm/daemon-base/__SCIKIT_LEARN__ new file mode 100644 index 000000000..e69de29bb diff --git a/ceph-releases/squid/ubi9-ibm/daemon-base/container.yaml b/ceph-releases/squid/ubi9-ibm/daemon-base/container.yaml new file mode 100644 index 000000000..5c7a547df --- /dev/null +++ b/ceph-releases/squid/ubi9-ibm/daemon-base/container.yaml @@ -0,0 +1,7 @@ +# https://osbs.readthedocs.io/en/latest/users.html#compose +--- + +compose: + packages: [] + pulp_repos: true + ignore_absent_pulp_repos: true diff --git a/ceph-releases/squid/ubi9-ibm/daemon-base/content_sets.yml b/ceph-releases/squid/ubi9-ibm/daemon-base/content_sets.yml new file mode 100644 index 000000000..6237b275e --- /dev/null +++ b/ceph-releases/squid/ubi9-ibm/daemon-base/content_sets.yml @@ -0,0 +1,25 @@ +# This file defines which Pulp content sets (yum repositories) OSBS needs in +# order to build this image. This also helps determine which images are +# vulnerable to specific CVEs. Generally you should only need to update this +# file when: +# 1. You start depending on a new product +# 2. You are preparing new product release and your content sets will change +# +# See https://osbs.readthedocs.io/en/latest/users.html#content-sets for more +# information on maintaining this file. +--- +x86_64: + - rhel-9-for-x86_64-baseos-rpms + - rhel-9-for-x86_64-appstream-rpms + - rhceph-8-tools-for-rhel-9-x86_64-rpms + - codeready-builder-for-rhel-9-x86_64-rpms +ppc64le: + - rhel-9-for-ppc64le-baseos-rpms + - rhel-9-for-ppc64le-appstream-rpms + - rhceph-8-tools-for-rhel-9-ppc64le-rpms + - codeready-builder-for-rhel-9-ppc64le-rpms +s390x: + - rhel-9-for-s390x-baseos-rpms + - rhel-9-for-s390x-appstream-rpms + - rhceph-8-tools-for-rhel-9-s390x-rpms + - codeready-builder-for-rhel-9-s390x-rpms diff --git a/ceph-releases/squid/ubi9-ibm/daemon/__DOCKERFILE_INSTALL__ b/ceph-releases/squid/ubi9-ibm/daemon/__DOCKERFILE_INSTALL__ new file mode 100644 index 000000000..e69de29bb diff --git a/ceph-releases/squid/ubi9-ibm/daemon/__DOCKERFILE_PREINSTALL__ b/ceph-releases/squid/ubi9-ibm/daemon/__DOCKERFILE_PREINSTALL__ new file mode 100644 index 000000000..e69de29bb diff --git a/ceph-releases/squid/ubi9-ibm/daemon/__DOCKERFILE_VERIFY_PACKAGES__ b/ceph-releases/squid/ubi9-ibm/daemon/__DOCKERFILE_VERIFY_PACKAGES__ new file mode 100644 index 000000000..d35355ee0 --- /dev/null +++ b/ceph-releases/squid/ubi9-ibm/daemon/__DOCKERFILE_VERIFY_PACKAGES__ @@ -0,0 +1 @@ +rpm -q __DAEMON_PACKAGES__ diff --git a/ceph-releases/squid/ubi9-redhat/daemon-base/__CRIMSON_PACKAGES__ b/ceph-releases/squid/ubi9-redhat/daemon-base/__CRIMSON_PACKAGES__ new file mode 100644 index 000000000..e69de29bb diff --git a/ceph-releases/squid/ubi9-redhat/daemon-base/__CSI_PACKAGES__ b/ceph-releases/squid/ubi9-redhat/daemon-base/__CSI_PACKAGES__ new file mode 100644 index 000000000..e69de29bb diff --git a/ceph-releases/squid/ubi9-redhat/daemon-base/__DOCKERFILE_INSTALL__ b/ceph-releases/squid/ubi9-redhat/daemon-base/__DOCKERFILE_INSTALL__ new file mode 100644 index 000000000..c03bf5d25 --- /dev/null +++ b/ceph-releases/squid/ubi9-redhat/daemon-base/__DOCKERFILE_INSTALL__ @@ -0,0 +1,2 @@ +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 __CEPH_BASE_PACKAGES__ \ No newline at end of file diff --git a/ceph-releases/squid/ubi9-redhat/daemon-base/__DOCKERFILE_LABELS__ b/ceph-releases/squid/ubi9-redhat/daemon-base/__DOCKERFILE_LABELS__ new file mode 100644 index 000000000..92851a256 --- /dev/null +++ b/ceph-releases/squid/ubi9-redhat/daemon-base/__DOCKERFILE_LABELS__ @@ -0,0 +1,10 @@ +# Atomic specific labels +LABEL version="8" + +# Build specific labels +LABEL com.redhat.component="rhceph-container" +LABEL name="rhceph" +LABEL description="Red Hat Ceph Storage 8" +LABEL summary="Provides the latest Red Hat Ceph Storage 8 on RHEL 9 in a fully featured and supported base image." +LABEL io.k8s.display-name="Red Hat Ceph Storage 8 on RHEL 9" +LABEL io.openshift.tags="rhceph ceph" diff --git a/ceph-releases/squid/ubi9-redhat/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__ b/ceph-releases/squid/ubi9-redhat/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__ new file mode 100644 index 000000000..b8b5033b9 --- /dev/null +++ b/ceph-releases/squid/ubi9-redhat/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__ @@ -0,0 +1,4 @@ +echo 'Postinstall cleanup' && \ + ( microdnf clean all && \ + rpm -q __CEPH_BASE_PACKAGES__ && \ + rm -f /etc/profile.d/lang.sh ) diff --git a/ceph-releases/squid/ubi9-redhat/daemon-base/__DOCKERFILE_PREINSTALL__ b/ceph-releases/squid/ubi9-redhat/daemon-base/__DOCKERFILE_PREINSTALL__ new file mode 100644 index 000000000..31f615464 --- /dev/null +++ b/ceph-releases/squid/ubi9-redhat/daemon-base/__DOCKERFILE_PREINSTALL__ @@ -0,0 +1 @@ +RUN rm -f /etc/yum.repos.d/ubi.repo diff --git a/ceph-releases/squid/ubi9-redhat/daemon-base/__DOCKERFILE_VERIFY_PACKAGES__ b/ceph-releases/squid/ubi9-redhat/daemon-base/__DOCKERFILE_VERIFY_PACKAGES__ new file mode 100644 index 000000000..0fea829cc --- /dev/null +++ b/ceph-releases/squid/ubi9-redhat/daemon-base/__DOCKERFILE_VERIFY_PACKAGES__ @@ -0,0 +1 @@ +rpm -q __CEPH_BASE_PACKAGES__ diff --git a/ceph-releases/squid/ubi9-redhat/daemon-base/__ETC_REDHAT_STORAGE_RELEASE__ b/ceph-releases/squid/ubi9-redhat/daemon-base/__ETC_REDHAT_STORAGE_RELEASE__ new file mode 100644 index 000000000..5743c869b --- /dev/null +++ b/ceph-releases/squid/ubi9-redhat/daemon-base/__ETC_REDHAT_STORAGE_RELEASE__ @@ -0,0 +1,2 @@ +# Editing /etc/redhat-storage-server release file +RUN echo "Red Hat Ceph Storage Server 8 (Container)" > /etc/redhat-storage-release diff --git a/ceph-releases/squid/ubi9-redhat/daemon-base/__RADOSGW_PACKAGES__ b/ceph-releases/squid/ubi9-redhat/daemon-base/__RADOSGW_PACKAGES__ new file mode 100644 index 000000000..4879dadf9 --- /dev/null +++ b/ceph-releases/squid/ubi9-redhat/daemon-base/__RADOSGW_PACKAGES__ @@ -0,0 +1 @@ +ceph-radosgw__ENV_[CEPH_POINT_RELEASE]__ libradosstriper1__ENV_[CEPH_POINT_RELEASE]__ diff --git a/ceph-releases/squid/ubi9-redhat/daemon-base/__SCIKIT_LEARN__ b/ceph-releases/squid/ubi9-redhat/daemon-base/__SCIKIT_LEARN__ new file mode 100644 index 000000000..e69de29bb diff --git a/ceph-releases/squid/ubi9-redhat/daemon-base/container.yaml b/ceph-releases/squid/ubi9-redhat/daemon-base/container.yaml new file mode 100644 index 000000000..5c7a547df --- /dev/null +++ b/ceph-releases/squid/ubi9-redhat/daemon-base/container.yaml @@ -0,0 +1,7 @@ +# https://osbs.readthedocs.io/en/latest/users.html#compose +--- + +compose: + packages: [] + pulp_repos: true + ignore_absent_pulp_repos: true diff --git a/ceph-releases/squid/ubi9-redhat/daemon-base/content_sets.yml b/ceph-releases/squid/ubi9-redhat/daemon-base/content_sets.yml new file mode 100644 index 000000000..6237b275e --- /dev/null +++ b/ceph-releases/squid/ubi9-redhat/daemon-base/content_sets.yml @@ -0,0 +1,25 @@ +# This file defines which Pulp content sets (yum repositories) OSBS needs in +# order to build this image. This also helps determine which images are +# vulnerable to specific CVEs. Generally you should only need to update this +# file when: +# 1. You start depending on a new product +# 2. You are preparing new product release and your content sets will change +# +# See https://osbs.readthedocs.io/en/latest/users.html#content-sets for more +# information on maintaining this file. +--- +x86_64: + - rhel-9-for-x86_64-baseos-rpms + - rhel-9-for-x86_64-appstream-rpms + - rhceph-8-tools-for-rhel-9-x86_64-rpms + - codeready-builder-for-rhel-9-x86_64-rpms +ppc64le: + - rhel-9-for-ppc64le-baseos-rpms + - rhel-9-for-ppc64le-appstream-rpms + - rhceph-8-tools-for-rhel-9-ppc64le-rpms + - codeready-builder-for-rhel-9-ppc64le-rpms +s390x: + - rhel-9-for-s390x-baseos-rpms + - rhel-9-for-s390x-appstream-rpms + - rhceph-8-tools-for-rhel-9-s390x-rpms + - codeready-builder-for-rhel-9-s390x-rpms diff --git a/ceph-releases/squid/ubi9-redhat/daemon/__DOCKERFILE_INSTALL__ b/ceph-releases/squid/ubi9-redhat/daemon/__DOCKERFILE_INSTALL__ new file mode 100644 index 000000000..e69de29bb diff --git a/ceph-releases/squid/ubi9-redhat/daemon/__DOCKERFILE_PREINSTALL__ b/ceph-releases/squid/ubi9-redhat/daemon/__DOCKERFILE_PREINSTALL__ new file mode 100644 index 000000000..e69de29bb diff --git a/ceph-releases/squid/ubi9-redhat/daemon/__DOCKERFILE_VERIFY_PACKAGES__ b/ceph-releases/squid/ubi9-redhat/daemon/__DOCKERFILE_VERIFY_PACKAGES__ new file mode 100644 index 000000000..d35355ee0 --- /dev/null +++ b/ceph-releases/squid/ubi9-redhat/daemon/__DOCKERFILE_VERIFY_PACKAGES__ @@ -0,0 +1 @@ +rpm -q __DAEMON_PACKAGES__