Skip to content

Commit 8ddcee6

Browse files
committed
Files to rebuild PSQL container for C8S
Signed-off-by: Petr "Stone" Hracek <[email protected]>
1 parent 4e09055 commit 8ddcee6

File tree

7 files changed

+107
-0
lines changed

7 files changed

+107
-0
lines changed

manifest.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,27 @@ DISTGEN_MULTI_RULES:
3232
- src: src/Dockerfile
3333
dest: Dockerfile.c9s
3434

35+
- src: src/Dockerfile
36+
dest: Dockerfile.c8s
37+
3538
- src: src/Dockerfile.fedora
3639
dest: Dockerfile.fedora
3740

3841

3942
# Files to copy
4043
COPY_RULES:
44+
- src: src/CentOS-Stream-AppStream.repo
45+
dest: CentOS-Stream-AppStream.repo
46+
47+
- src: src/CentOS-Stream-BaseOS.repo
48+
dest: CentOS-Stream-BaseOS.repo
49+
50+
- src: src/CentOS-Stream-Extras.repo
51+
dest: CentOS-Stream-Extras.repo
52+
53+
- src: src/CentOS-Stream-Extras-common.repo
54+
dest: CentOS-Stream-Extras-common.repo
55+
4156
- src: src/root/usr/libexec/fix-permissions
4257
dest: root/usr/libexec/fix-permissions
4358
mode: "0755"

specs/multispec.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,21 @@ specs:
4242
{ yum -y module enable postgresql:{{ spec.version }} || :; } && \
4343
post_install: >-4
4444
(yum -y reinstall tzdata || yum -y update tzdata ) && \
45+
c8s:
46+
distros:
47+
- centos-stream-8-x86_64
48+
s2i_base: quay.io/sclorg/s2i-core-c8s:c8s
49+
org: "sclorg"
50+
prod: "c8s"
51+
openshift_tags: "database,postgresql,postgresql{{ spec.short }},postgresql-{{ spec.short }}"
52+
redhat_component: "postgresql-{{ spec.short }}-container"
53+
img_name: "{{ spec.org }}/postgresql-{{ spec.short }}-{{ spec.prod }}"
54+
pkgs: "postgresql-server postgresql-contrib"
55+
environment_setup: >-4
56+
yum -y module enable postgresql:{{ spec.version }} && \
57+
post_install: >-4
58+
yum -y reinstall tzdata && \
59+
4560
c9s:
4661
distros:
4762
- centos-stream-9-x86_64
@@ -106,16 +121,22 @@ specs:
106121

107122
matrix:
108123
include:
124+
- version: "10"
125+
distros:
126+
- rhel-8-x86_64
127+
- centos-stream-8-x86_64
109128
- version: "12"
110129
distros:
111130
- rhel-8-x86_64
112131
- fedora-38-x86_64
132+
- centos-stream-8-x86_64
113133
- version: "13"
114134
distros:
115135
- rhel-8-x86_64
116136
- rhel-9-x86_64
117137
- centos-stream-9-x86_64
118138
- fedora-38-x86_64
139+
- centos-stream-8-x86_64
119140
- version: "14"
120141
distros:
121142
- fedora-38-x86_64
@@ -124,10 +145,12 @@ matrix:
124145
- rhel-8-x86_64
125146
- rhel-9-x86_64
126147
- centos-stream-9-x86_64
148+
- centos-stream-8-x86_64
127149
- fedora-38-x86_64
128150
- version: "16"
129151
distros:
130152
- rhel-8-x86_64
131153
- rhel-9-x86_64
132154
- centos-stream-9-x86_64
155+
- centos-stream-8-x86_64
133156
- fedora-38-x86_64

src/CentOS-Stream-AppStream.repo

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

src/CentOS-Stream-BaseOS.repo

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

src/CentOS-Stream-Extras-common.repo

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

src/CentOS-Stream-Extras.repo

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

src/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ LABEL summary="$SUMMARY" \
4848
EXPOSE 5432
4949

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

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

0 commit comments

Comments
 (0)