Skip to content
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.

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

Files to rebuild PSQL container for C8S - DO NOT MERGE #585

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,27 @@ DISTGEN_MULTI_RULES:
- src: src/Dockerfile
dest: Dockerfile.c9s

- src: src/Dockerfile
dest: Dockerfile.c8s

- src: src/Dockerfile.fedora
dest: Dockerfile.fedora


# Files to copy
COPY_RULES:
- src: src/CentOS-Stream-AppStream.repo
dest: CentOS-Stream-AppStream.repo

- src: src/CentOS-Stream-BaseOS.repo
dest: CentOS-Stream-BaseOS.repo

- src: src/CentOS-Stream-Extras.repo
dest: CentOS-Stream-Extras.repo

- src: src/CentOS-Stream-Extras-common.repo
dest: CentOS-Stream-Extras-common.repo

- src: src/root/usr/libexec/fix-permissions
dest: root/usr/libexec/fix-permissions
mode: "0755"
Expand Down
23 changes: 23 additions & 0 deletions specs/multispec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,21 @@ specs:
{ yum -y module enable postgresql:{{ spec.version }} || :; } && \
post_install: >-4
(yum -y reinstall tzdata || yum -y update tzdata ) && \
c8s:
distros:
- centos-stream-8-x86_64
s2i_base: quay.io/sclorg/s2i-core-c8s:c8s
org: "sclorg"
prod: "c8s"
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 && \

c9s:
distros:
- centos-stream-9-x86_64
Expand Down Expand Up @@ -106,16 +121,22 @@ specs:

matrix:
include:
- version: "10"
distros:
- rhel-8-x86_64
- centos-stream-8-x86_64
- version: "12"
distros:
- rhel-8-x86_64
- fedora-38-x86_64
- centos-stream-8-x86_64
- version: "13"
distros:
- rhel-8-x86_64
- rhel-9-x86_64
- centos-stream-9-x86_64
- fedora-38-x86_64
- centos-stream-8-x86_64
- version: "14"
distros:
- fedora-38-x86_64
Expand All @@ -124,10 +145,12 @@ matrix:
- rhel-8-x86_64
- rhel-9-x86_64
- centos-stream-9-x86_64
- centos-stream-8-x86_64
- fedora-38-x86_64
- version: "16"
distros:
- rhel-8-x86_64
- rhel-9-x86_64
- centos-stream-9-x86_64
- centos-stream-8-x86_64
- fedora-38-x86_64
17 changes: 17 additions & 0 deletions src/CentOS-Stream-AppStream.repo
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# CentOS-Stream-AppStream.repo
#
# The mirrorlist system uses the connecting IP address of the client and the
# update status of each mirror to pick current mirrors that are geographically
# close to the client. You should use this for CentOS updates unless you are
# manually picking other mirrors.
#
# If the mirrorlist does not work for you, you can try the commented out
# baseurl line instead.

[appstream]
name=CentOS Stream 8 - AppStream
#mirrorlist=https://vault.centos.org/8-stream?release=$stream&arch=$basearch&repo=AppStream&infra=$infra
baseurl=https://vault.centos.org/8-stream/AppStream/$basearch/os/
gpgcheck=0
enabled=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
17 changes: 17 additions & 0 deletions src/CentOS-Stream-BaseOS.repo
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# CentOS-Stream-BaseOS.repo
#
# The mirrorlist system uses the connecting IP address of the client and the
# update status of each mirror to pick current mirrors that are geographically
# close to the client. You should use this for CentOS updates unless you are
# manually picking other mirrors.
#
# If the mirrorlist does not work for you, you can try the commented out
# baseurl line instead.

[baseos]
name=CentOS Stream 8 - BaseOS
#mirrorlist=https://vault.centos.org/8-stream?release=$stream&arch=$basearch&repo=AppStream&infra=$infra
baseurl=https://vault.centos.org/8-stream/BaseOS/$basearch/os/
gpgcheck=0
enabled=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
17 changes: 17 additions & 0 deletions src/CentOS-Stream-Extras-common.repo
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# CentOS-Stream-Extras-common.repo
#
# The mirrorlist system uses the connecting IP address of the client and the
# update status of each mirror to pick current mirrors that are geographically
# close to the client. You should use this for CentOS updates unless you are
# manually picking other mirrors.
#
# If the mirrorlist does not work for you, you can try the commented out
# baseurl line instead.

[extras-common]
name=CentOS Stream 8 - Extras common
#mirrorlist=https://vault.centos.org/8-stream?release=$stream&arch=$basearch&repo=AppStream&infra=$infra
baseurl=https://vault.centos.org/8-stream/centosplus/$basearch/os/
gpgcheck=0
enabled=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
17 changes: 17 additions & 0 deletions src/CentOS-Stream-Extras.repo
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# CentOS-Stream-Extras.repo
#
# The mirrorlist system uses the connecting IP address of the client and the
# update status of each mirror to pick current mirrors that are geographically
# close to the client. You should use this for CentOS updates unless you are
# manually picking other mirrors.
#
# If the mirrorlist does not work for you, you can try the commented out
# baseurl line instead.

[extras]
name=CentOS Stream 8 - Extras
#mirrorlist=https://vault.centos.org/8-stream?release=$stream&arch=$basearch&repo=AppStream&infra=$infra
baseurl=https://vault.centos.org/8-stream/extras/$basearch/os/
gpgcheck=0
enabled=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
1 change: 1 addition & 0 deletions src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ LABEL summary="$SUMMARY" \
EXPOSE 5432

COPY root/usr/libexec/fix-permissions /usr/libexec/fix-permissions
COPY CentOS-Stream-AppStream.repo CentOS-Stream-BaseOS.repo CentOS-Stream-Extras.repo CentOS-Stream-Extras-common.repo /etc/yum.repos.d/

# This image must forever use UID 26 for postgres user so our volumes are
# safe in the future. This should *never* change, the last test is there
Expand Down