-
Notifications
You must be signed in to change notification settings - Fork 524
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This allows building redhat and ibm containers for 8 (squid) Fixes: #2209 Signed-off-by: Guillaume Abrioux <[email protected]>
- Loading branch information
Showing
36 changed files
with
126 additions
and
0 deletions.
There are no files selected for viewing
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../../src/daemon-base/__GANESHA_PACKAGES__ |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 && \ |
Empty file.
Empty file.
2 changes: 2 additions & 0 deletions
2
ceph-releases/squid/ubi9-ibm/daemon-base/__DOCKERFILE_INSTALL__
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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__ |
10 changes: 10 additions & 0 deletions
10
ceph-releases/squid/ubi9-ibm/daemon-base/__DOCKERFILE_LABELS__
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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" |
4 changes: 4 additions & 0 deletions
4
ceph-releases/squid/ubi9-ibm/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| echo 'Postinstall cleanup' && \ | ||
| ( microdnf clean all && \ | ||
| rpm -q __CEPH_BASE_PACKAGES__ && \ | ||
| rm -f /etc/profile.d/lang.sh ) |
1 change: 1 addition & 0 deletions
1
ceph-releases/squid/ubi9-ibm/daemon-base/__DOCKERFILE_PREINSTALL__
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| RUN rm -f /etc/yum.repos.d/ubi.repo |
1 change: 1 addition & 0 deletions
1
ceph-releases/squid/ubi9-ibm/daemon-base/__DOCKERFILE_VERIFY_PACKAGES__
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| rpm -q __CEPH_BASE_PACKAGES__ |
2 changes: 2 additions & 0 deletions
2
ceph-releases/squid/ubi9-ibm/daemon-base/__ETC_REDHAT_STORAGE_RELEASE__
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| # Editing /etc/redhat-storage-server release file | ||
| RUN echo "IBM Storage Ceph 8 (Container)" > /etc/redhat-storage-release |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ENV ACCEPT_EULA YES |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ceph-radosgw__ENV_[CEPH_POINT_RELEASE]__ libradosstriper1__ENV_[CEPH_POINT_RELEASE]__ |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| # https://osbs.readthedocs.io/en/latest/users.html#compose | ||
| --- | ||
|
|
||
| compose: | ||
| packages: [] | ||
| pulp_repos: true | ||
| ignore_absent_pulp_repos: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
Empty file.
Empty file.
1 change: 1 addition & 0 deletions
1
ceph-releases/squid/ubi9-ibm/daemon/__DOCKERFILE_VERIFY_PACKAGES__
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| rpm -q __DAEMON_PACKAGES__ |
Empty file.
Empty file.
2 changes: 2 additions & 0 deletions
2
ceph-releases/squid/ubi9-redhat/daemon-base/__DOCKERFILE_INSTALL__
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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__ |
10 changes: 10 additions & 0 deletions
10
ceph-releases/squid/ubi9-redhat/daemon-base/__DOCKERFILE_LABELS__
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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" |
4 changes: 4 additions & 0 deletions
4
ceph-releases/squid/ubi9-redhat/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| echo 'Postinstall cleanup' && \ | ||
| ( microdnf clean all && \ | ||
| rpm -q __CEPH_BASE_PACKAGES__ && \ | ||
| rm -f /etc/profile.d/lang.sh ) |
1 change: 1 addition & 0 deletions
1
ceph-releases/squid/ubi9-redhat/daemon-base/__DOCKERFILE_PREINSTALL__
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| RUN rm -f /etc/yum.repos.d/ubi.repo |
1 change: 1 addition & 0 deletions
1
ceph-releases/squid/ubi9-redhat/daemon-base/__DOCKERFILE_VERIFY_PACKAGES__
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| rpm -q __CEPH_BASE_PACKAGES__ |
2 changes: 2 additions & 0 deletions
2
ceph-releases/squid/ubi9-redhat/daemon-base/__ETC_REDHAT_STORAGE_RELEASE__
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| # Editing /etc/redhat-storage-server release file | ||
| RUN echo "Red Hat Ceph Storage Server 8 (Container)" > /etc/redhat-storage-release |
1 change: 1 addition & 0 deletions
1
ceph-releases/squid/ubi9-redhat/daemon-base/__RADOSGW_PACKAGES__
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ceph-radosgw__ENV_[CEPH_POINT_RELEASE]__ libradosstriper1__ENV_[CEPH_POINT_RELEASE]__ |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| # https://osbs.readthedocs.io/en/latest/users.html#compose | ||
| --- | ||
|
|
||
| compose: | ||
| packages: [] | ||
| pulp_repos: true | ||
| ignore_absent_pulp_repos: true |
25 changes: 25 additions & 0 deletions
25
ceph-releases/squid/ubi9-redhat/daemon-base/content_sets.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
Empty file.
Empty file.
1 change: 1 addition & 0 deletions
1
ceph-releases/squid/ubi9-redhat/daemon/__DOCKERFILE_VERIFY_PACKAGES__
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| rpm -q __DAEMON_PACKAGES__ |