Skip to content

Add centos8 support for the dist-gen configs #383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Add centos8 support for the dist-gen configs #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common
Open in desktop
Submodule common updated 7 files
+1 −1 README.md
+44 −1 build.sh
+11 −0 check_imagestreams.py
+3 −0 common.mk
+4 −0 generate.sh
+2 −0 test-lib.sh
+2 −1 test.sh
3 changes: 3 additions & 0 deletions manifest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ DISTGEN_MULTI_RULES="
src=src/Dockerfile
dest=Dockerfile;

src=src/Dockerfile
dest=Dockerfile.centos8;

src=src/Dockerfile
dest=Dockerfile.rhel7;

Expand Down
17 changes: 16 additions & 1 deletion specs/multispec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 1

specs:
distroinfo:
centos:
centos7:
distros:
- centos-7-x86_64
s2i_base: centos/s2i-core-centos7
Expand All @@ -18,6 +18,20 @@ specs:
staging_repo_setup: >-4
yum-config-manager --add-repo https://cbs.centos.org/repos/sclo7-rh-postgresql96-rh-candidate/x86_64/os/ && \
echo gpgcheck=0 >> /etc/yum.repos.d/cbs.centos.org_repos_sclo7-rh-postgresql96-rh-candidate_x86_64_os_.repo && \
centos8:
distros:
- centos-8-x86_64
s2i_base: centos/s2i-core-centos8
org: "centos"
prod: "centos8"
openshift_tags: "database,postgresql,postgresql{{ spec.short }},postgresql-{{ spec.short }}"
redhat_component: "postgresql-{{ spec.short }}-container"
img_name: "{{ spec.org }}/postgresql-{{ spec.short }}-{{ spec.prod }}"
pkgs: "postgresql-server postgresql-contrib"
environment_setup: >-4
yum -y module enable postgresql:{{ spec.version }} && \
post_install: >-4
yum -y reinstall tzdata && \
rhel7:
distros:
- rhel-7-x86_64
Expand Down Expand Up @@ -110,6 +124,7 @@ matrix:
- rhel-7-x86_64
- rhel-8-x86_64
- centos-7-x86_64
- centos-8-x86_64
version: "11"
- distros:
- rhel-8-x86_64
Expand Down
4 changes: 4 additions & 0 deletions src/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,11 @@ RUN {{ spec.environment_setup }}
{% endif %}
INSTALL_PKGS="rsync tar gettext bind-utils nss_wrapper {{ spec.pkgs }}" && \
{% if spec.version in ["12"] %}
{% if config.os.version == 7 %}
INSTALL_PKGS="$INSTALL_PKGS rh-postgresql{{ spec.short }}-pgaudit" && \
{% else %}
INSTALL_PKGS="$INSTALL_PKGS pgaudit" && \
{% endif %}
{% endif %}
yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
Expand Down