Skip to content

Commit f0ad3ea

Browse files
committed
Remove mentions of RHEL 7 and update READMEs
1 parent 48738da commit f0ad3ea

File tree

8 files changed

+48
-49
lines changed

8 files changed

+48
-49
lines changed

12/root/usr/share/container-scripts/postgresql/README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# PostgreSQL 12 SQL Database Server Container Image
22

3-
This container image features the PostgreSQL 12 SQL database server, suitable for OpenShift and general applications. Users have the option to select from RHEL, CentOS Stream, and Fedora-based images. RHEL images can be found in the [Red Hat Container Catalog](https://access.redhat.com/containers/), while CentOS Stream images are available on [Quay.io](https://quay.io/organization/sclorg), and Fedora images can be accessed in [Quay.io](https://quay.io/organization/fedora). The resulting image can be executed using [podman](https://github.com/containers/libpod).
3+
This container image features the PostgreSQL 12 SQL database server, suitable for OpenShift and general applications.
4+
Only RHEL based images are available.
5+
RHEL images can be found in the [Red Hat Container Catalog](https://access.redhat.com/containers/).
6+
The resulting image can be executed using [podman](https://github.com/containers/libpod).
47

58
Please note that while the examples provided in this README utilize `podman`, it is possible to substitute any instance of `podman` with `docker` and the same arguments. `podman` can be installed with on Fedora with command `dnf install podman-docker`.
69

@@ -224,4 +227,4 @@ Subsequently, log output is redirected to the logging collector process and will
224227

225228
## Additional Resources
226229

227-
The Dockerfile and other sources related to this container image can be found at https://github.com/sclorg/postgresql-container. In this repository, the RHEL8 Dockerfile is named Dockerfile.rhel8, the RHEL9 Dockerfile is named Dockerfile.rhel9, the RHEL10 Dockerfile is named Dockerfile.rhel10, and the Fedora Dockerfile is named Dockerfile.fedora.
230+
The Dockerfile and other sources related to this container image can be found at https://github.com/sclorg/postgresql-container. In this repository, the RHEL8 Dockerfile is named Dockerfile.rhel8.

13/root/usr/share/container-scripts/postgresql/README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# PostgreSQL 13 SQL Database Server Container Image
22

3-
This container image features the PostgreSQL 13 SQL database server, suitable for OpenShift and general applications. Users have the option to select from RHEL, CentOS Stream, and Fedora-based images. RHEL images can be found in the [Red Hat Container Catalog](https://access.redhat.com/containers/), while CentOS Stream images are available on [Quay.io](https://quay.io/organization/sclorg), and Fedora images can be accessed in [Quay.io](https://quay.io/organization/fedora). The resulting image can be executed using [podman](https://github.com/containers/libpod).
3+
This container image features the PostgreSQL 13 SQL database server, suitable for OpenShift and general applications. Users have the option to select from RHEL, CentOS Stream, and Fedora-based images. RHEL images can be found in the [Red Hat Container Catalog](https://access.redhat.com/containers/), while CentOS Stream images are available on [Quay.io](https://quay.io/organization/sclorg). The resulting image can be executed using [podman](https://github.com/containers/libpod).
44

55
Please note that while the examples provided in this README utilize `podman`, it is possible to substitute any instance of `podman` with `docker` and the same arguments. `podman` can be installed with on Fedora with command `dnf install podman-docker`.
66

@@ -10,10 +10,10 @@ This container image offers a containerized version of the PostgreSQL postgres d
1010

1111
## Usage
1212

13-
Assuming you are utilizing the `rhel8/postgresql-13` image, which is accessible via the `postgresql:13` imagestream tag in Openshift, the following steps outline usage. To set only the mandatory environment variables without storing the database in a host directory, execute this command:
13+
Assuming you are utilizing the `rhel9/postgresql-13` image, which is accessible via the `postgresql:13` imagestream tag in Openshift, the following steps outline usage. To set only the mandatory environment variables without storing the database in a host directory, execute this command:
1414

1515
```bash
16-
$ podman run -d --name postgresql_database -e POSTGRESQL_USER=user -e POSTGRESQL_PASSWORD=pass -e POSTGRESQL_DATABASE=db -p 5432:5432 rhel8/postgresql-13
16+
$ podman run -d --name postgresql_database -e POSTGRESQL_USER=user -e POSTGRESQL_PASSWORD=pass -e POSTGRESQL_DATABASE=db -p 5432:5432 rhel9/postgresql-13
1717
```
1818

1919
This command creates a container named `postgresql_database` running PostgreSQL with the database `db` and a user with the credentials `user:pass`.
@@ -110,7 +110,7 @@ $ podman run -d --name postgresql_database \
110110
-e POSTGRESQL_MIGRATION_REMOTE_HOST=172.17.0.2 \
111111
-e POSTGRESQL_MIGRATION_ADMIN_PASSWORD=remoteAdminP@ssword \
112112
[ OPTIONAL_CONFIGURATION_VARIABLES ]
113-
rhel8/postgresql-13
113+
rhel9/postgresql-13
114114
```
115115

116116
The migration is performed using the **dump and restore** method (running `pg_dumpall` against the remote cluster and importing the dump locally using `psql`). The process is streamed (via a Unix pipeline), eliminating the need for intermediate dump files and conserving storage space.
@@ -170,7 +170,7 @@ Data files are hard-linked from the old to the new data directory, providing per
170170

171171
## Extending Image
172172

173-
You can extend this image in Openshift using the `Source` build strategy or via the standalone [source-to-image](https://github.com/openshift/source-to-image) application (where available). For this example, assume that you are using the `rhel8/postgresql-13` image, available via `postgresql:13` imagestream tag in Openshift.
173+
You can extend this image in Openshift using the `Source` build strategy or via the standalone [source-to-image](https://github.com/openshift/source-to-image) application (where available). For this example, assume that you are using the `rhel9/postgresql-13` image, available via `postgresql:13` imagestream tag in Openshift.
174174

175175
To build a customized image `new-postgresql` with configuration from `https://github.com/sclorg/postgresql-container/tree/master/examples/extending-image`, run:
176176

@@ -186,7 +186,7 @@ $ oc new-app postgresql:13~https://github.com/sclorg/postgresql-container.git \
186186
or via `s2i`:
187187

188188
```
189-
$ s2i build --context-dir examples/extending-image/ https://github.com/sclorg/postgresql-container.git rhel8/postgresql-13 new-postgresql
189+
$ s2i build --context-dir examples/extending-image/ https://github.com/sclorg/postgresql-container.git rhel9/postgresql-13 new-postgresql
190190
```
191191

192192
The directory passed to Openshift should contain one or more of the following directories:
@@ -224,4 +224,4 @@ Subsequently, log output is redirected to the logging collector process and will
224224

225225
## Additional Resources
226226

227-
The Dockerfile and other sources related to this container image can be found at https://github.com/sclorg/postgresql-container. In this repository, the RHEL8 Dockerfile is named Dockerfile.rhel8, the RHEL9 Dockerfile is named Dockerfile.rhel9, the RHEL10 Dockerfile is named Dockerfile.rhel10, and the Fedora Dockerfile is named Dockerfile.fedora.
227+
The Dockerfile and other sources related to this container image can be found at https://github.com/sclorg/postgresql-container. In this repository, the RHEL8 Dockerfile is named Dockerfile.rhel8, the RHEL9 Dockerfile is named Dockerfile.rhel9, and the CentOS Stream 9 Dockerfile is named Dockerfile.c9s.

15/root/usr/share/container-scripts/postgresql/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ This container image offers a containerized version of the PostgreSQL postgres d
1010

1111
## Usage
1212

13-
Assuming you are utilizing the `rhel8/postgresql-15` image, which is accessible via the `postgresql:15` imagestream tag in Openshift, the following steps outline usage. To set only the mandatory environment variables without storing the database in a host directory, execute this command:
13+
Assuming you are utilizing the `rhel9/postgresql-15` image, which is accessible via the `postgresql:15` imagestream tag in Openshift, the following steps outline usage. To set only the mandatory environment variables without storing the database in a host directory, execute this command:
1414

1515
```bash
16-
$ podman run -d --name postgresql_database -e POSTGRESQL_USER=user -e POSTGRESQL_PASSWORD=pass -e POSTGRESQL_DATABASE=db -p 5432:5432 rhel8/postgresql-15
16+
$ podman run -d --name postgresql_database -e POSTGRESQL_USER=user -e POSTGRESQL_PASSWORD=pass -e POSTGRESQL_DATABASE=db -p 5432:5432 rhel9/postgresql-15
1717
```
1818

1919
This command creates a container named `postgresql_database` running PostgreSQL with the database `db` and a user with the credentials `user:pass`.
@@ -110,7 +110,7 @@ $ podman run -d --name postgresql_database \
110110
-e POSTGRESQL_MIGRATION_REMOTE_HOST=172.17.0.2 \
111111
-e POSTGRESQL_MIGRATION_ADMIN_PASSWORD=remoteAdminP@ssword \
112112
[ OPTIONAL_CONFIGURATION_VARIABLES ]
113-
rhel8/postgresql-13
113+
rhel9/postgresql-15
114114
```
115115

116116
The migration is performed using the **dump and restore** method (running `pg_dumpall` against the remote cluster and importing the dump locally using `psql`). The process is streamed (via a Unix pipeline), eliminating the need for intermediate dump files and conserving storage space.
@@ -170,7 +170,7 @@ Data files are hard-linked from the old to the new data directory, providing per
170170

171171
## Extending Image
172172

173-
You can extend this image in Openshift using the `Source` build strategy or via the standalone [source-to-image](https://github.com/openshift/source-to-image) application (where available). For this example, assume that you are using the `rhel8/postgresql-15` image, available via `postgresql:15` imagestream tag in Openshift.
173+
You can extend this image in Openshift using the `Source` build strategy or via the standalone [source-to-image](https://github.com/openshift/source-to-image) application (where available). For this example, assume that you are using the `rhel9/postgresql-15` image, available via `postgresql:15` imagestream tag in Openshift.
174174

175175
To build a customized image `new-postgresql` with configuration from `https://github.com/sclorg/postgresql-container/tree/master/examples/extending-image`, run:
176176

@@ -186,7 +186,7 @@ $ oc new-app postgresql:15~https://github.com/sclorg/postgresql-container.git \
186186
or via `s2i`:
187187

188188
```
189-
$ s2i build --context-dir examples/extending-image/ https://github.com/sclorg/postgresql-container.git rhel8/postgresql-15 new-postgresql
189+
$ s2i build --context-dir examples/extending-image/ https://github.com/sclorg/postgresql-container.git rhel9/postgresql-15 new-postgresql
190190
```
191191

192192
The directory passed to Openshift should contain one or more of the following directories:
@@ -224,4 +224,4 @@ Subsequently, log output is redirected to the logging collector process and will
224224

225225
## Additional Resources
226226

227-
The Dockerfile and other sources related to this container image can be found at https://github.com/sclorg/postgresql-container. In this repository, the RHEL8 Dockerfile is named Dockerfile.rhel8, the RHEL9 Dockerfile is named Dockerfile.rhel9, the RHEL10 Dockerfile is named Dockerfile.rhel10, and the Fedora Dockerfile is named Dockerfile.fedora.
227+
The Dockerfile and other sources related to this container image can be found at https://github.com/sclorg/postgresql-container. In this repository, the RHEL8 Dockerfile is named Dockerfile.rhel8, the RHEL9 Dockerfile is named Dockerfile.rhel9, and the CentOS Stream 9 Dockerfile is named Dockerfile.c9s.

16/root/usr/share/container-scripts/postgresql/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ This container image offers a containerized version of the PostgreSQL postgres d
1010

1111
## Usage
1212

13-
Assuming you are utilizing the `` image, which is accessible via the `postgresql:16` imagestream tag in Openshift, the following steps outline usage. To set only the mandatory environment variables without storing the database in a host directory, execute this command:
13+
Assuming you are utilizing the `rhel10/postgresql-16` image, which is accessible via the `postgresql:16` imagestream tag in Openshift, the following steps outline usage. To set only the mandatory environment variables without storing the database in a host directory, execute this command:
1414

1515
```bash
16-
$ podman run -d --name postgresql_database -e POSTGRESQL_USER=user -e POSTGRESQL_PASSWORD=pass -e POSTGRESQL_DATABASE=db -p 5432:5432
16+
$ podman run -d --name postgresql_database -e POSTGRESQL_USER=user -e POSTGRESQL_PASSWORD=pass -e POSTGRESQL_DATABASE=db -p 5432:5432 rhel10/postgresql-16
1717
```
1818

1919
This command creates a container named `postgresql_database` running PostgreSQL with the database `db` and a user with the credentials `user:pass`.
@@ -110,7 +110,7 @@ $ podman run -d --name postgresql_database \
110110
-e POSTGRESQL_MIGRATION_REMOTE_HOST=172.17.0.2 \
111111
-e POSTGRESQL_MIGRATION_ADMIN_PASSWORD=remoteAdminP@ssword \
112112
[ OPTIONAL_CONFIGURATION_VARIABLES ]
113-
rhel8/postgresql-13
113+
rhel10/postgresql-16
114114
```
115115

116116
The migration is performed using the **dump and restore** method (running `pg_dumpall` against the remote cluster and importing the dump locally using `psql`). The process is streamed (via a Unix pipeline), eliminating the need for intermediate dump files and conserving storage space.
@@ -170,7 +170,7 @@ Data files are hard-linked from the old to the new data directory, providing per
170170

171171
## Extending Image
172172

173-
You can extend this image in Openshift using the `Source` build strategy or via the standalone [source-to-image](https://github.com/openshift/source-to-image) application (where available). For this example, assume that you are using the `` image, available via `postgresql:16` imagestream tag in Openshift.
173+
You can extend this image in Openshift using the `Source` build strategy or via the standalone [source-to-image](https://github.com/openshift/source-to-image) application (where available). For this example, assume that you are using the `rhel10-postgresql-16` image, available via `postgresql:16` imagestream tag in Openshift.
174174

175175
To build a customized image `new-postgresql` with configuration from `https://github.com/sclorg/postgresql-container/tree/master/examples/extending-image`, run:
176176

@@ -186,7 +186,7 @@ $ oc new-app postgresql:16~https://github.com/sclorg/postgresql-container.git \
186186
or via `s2i`:
187187

188188
```
189-
$ s2i build --context-dir examples/extending-image/ https://github.com/sclorg/postgresql-container.git new-postgresql
189+
$ s2i build --context-dir examples/extending-image/ https://github.com/sclorg/postgresql-container.git rhel10/postgresql-16 new-postgresql
190190
```
191191

192192
The directory passed to Openshift should contain one or more of the following directories:
@@ -224,4 +224,4 @@ Subsequently, log output is redirected to the logging collector process and will
224224

225225
## Additional Resources
226226

227-
The Dockerfile and other sources related to this container image can be found at https://github.com/sclorg/postgresql-container. In this repository, the RHEL8 Dockerfile is named Dockerfile.rhel8, the RHEL9 Dockerfile is named Dockerfile.rhel9, the RHEL10 Dockerfile is named Dockerfile.rhel10, and the Fedora Dockerfile is named Dockerfile.fedora.
227+
The Dockerfile and other sources related to this container image can be found at https://github.com/sclorg/postgresql-container. In this repository, the RHEL8 Dockerfile is named Dockerfile.rhel8, the RHEL9 Dockerfile is named Dockerfile.rhel9, the RHEL10 Dockerfile is named Dockerfile.rhel10, the CentOS Stream 9 Dockerfile is named Dockerfile.c9s, the CentOS Stream 10 Dockerfile is named Dockerfile.c10s, and the Fedora Dockerfile is named Dockerfile.fedora.

README.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@ Images available on Quay.io are:
66

77
- CentOS Stream 9 [postgresql-13](https://quay.io/repository/sclorg/postgresql-13-c9s)
88
- CentOS Stream 9 [postgresql-15](https://quay.io/repository/sclorg/postgresql-15-c9s)
9-
- Fedora [postgresql-11](https://quay.io/repository/fedora/postgresql-11)
10-
- Fedora [postgresql-12](https://quay.io/repository/fedora/postgresql-12)
11-
- Fedora [postgresql-13](https://quay.io/repository/fedora/postgresql-13)
12-
- Fedora [postgresql-14](https://quay.io/repository/fedora/postgresql-14)
9+
- CentOS Stream 9 [postgresql-16](https://quay.io/repository/sclorg/postgresql-16-c9s)
10+
- CentOS Stream 10 [postgresql-16](https://quay.io/repository/sclorg/postgresql-16-c10s)
1311
- Fedora [postgresql-15](https://quay.io/repository/fedora/postgresql-15)
12+
- Fedora [postgresql-16](https://quay.io/repository/fedora/postgresql-16)
1413

1514
This repository provides Dockerfiles for PostgreSQL container images, optimized for use with OpenShift. These images are available in RHEL, Fedora, and CentOS-based variants.
1615

@@ -25,52 +24,53 @@ PostgreSQL versions currently supported are:
2524

2625
- [postgresql-12](https://github.com/sclorg/postgresql-container/tree/master/12)
2726
- [postgresql-13](https://github.com/sclorg/postgresql-container/tree/master/13)
28-
- [postgresql-14](https://github.com/sclorg/postgresql-container/tree/master/14)
2927
- [postgresql-15](https://github.com/sclorg/postgresql-container/tree/master/15)
28+
- [postgresql-16](https://github.com/sclorg/postgresql-container/tree/master/16)
3029

3130
RHEL versions currently supported are:
3231
- RHEL8
3332
- RHEL9
3433
- RHEL10
3534

36-
CentOS versions currently supported are:
35+
CentOS Stream versions currently supported are:
3736
- CentOS Stream 9
37+
- CentOS Stream 10
3838

3939
## Installation
4040

41-
Choose either the CentOS Stream 9 or RHEL9-based image:
41+
Choose either the CentOS Stream or RHEL-based image:
4242

43-
- **RHEL9 based image**
43+
- **RHEL based image**
4444

45-
These images are available in the [Red Hat Container Catalog](https://access.redhat.com/containers/#/registry.access.redhat.com/rhel9/postgresql-13).
45+
These images are available in the [Red Hat Container Catalog](https://catalog.redhat.com/en/search?searchType=containers).
4646
To download the image, execute the following command:
4747

4848
```bash
49-
podman pull registry.redhat.io/rhel9/postgresql-13
49+
podman pull registry.redhat.io/rhel10/postgresql-16
5050
```
5151

52-
To build a RHEL9-based image, ensure you run Docker build on a RHEL machine with a valid subscription.
52+
To build a RHEL-based image, ensure you run Docker build on a RHEL machine with a valid subscription.
5353

5454
```bash
5555
$ git clone --recursive https://github.com/sclorg/postgresql-container.git
5656
$ cd postgresql
57-
$ make build TARGET=rhel9 VERSIONS=13
57+
$ make build TARGET=rhel10 VERSIONS=16
5858
```
5959

60-
- **CentOS Stream 9 based image**
60+
- **CentOS Stream based image**
6161

6262
These images are available on Quay.io. To download the image, execute the following command:
6363

6464
```bash
65-
$ podman pull https://quay.io/repository/sclorg/postgresql-13-c9s
65+
$ podman pull https://quay.io/repository/sclorg/postgresql-16-c10s
6666
```
6767

6868
To build a PostgreSQL image from scratch, perform the following steps:
6969

7070
```bash
7171
$ git clone --recursive https://github.com/sclorg/postgresql-container.git
7272
$ cd postgresql
73-
$ make build TARGET=c9s VERSIONS=13
73+
$ make build TARGET=c10s VERSIONS=16
7474
```
7575

7676
Note: While the installation steps utilize `podman`, you can substitute these calls with `docker` with the same arguments.
@@ -101,8 +101,8 @@ For detailed information on the usage of specific PostgreSQL Dockerfiles, please
101101

102102
- [PostgreSQL 12 Usage Documentation](https://github.com/sclorg/postgresql-container/tree/master/12)
103103
- [PostgreSQL 13 Usage Documentation](https://github.com/sclorg/postgresql-container/tree/master/13)
104-
- [PostgreSQL 14 Usage Documentation](https://github.com/sclorg/postgresql-container/tree/master/14)
105104
- [PostgreSQL 15 Usage Documentation](https://github.com/sclorg/postgresql-container/tree/master/15)
105+
- [PostgreSQL 16 Usage Documentation](https://github.com/sclorg/postgresql-container/tree/master/16)
106106

107107
For unsupported versions, you may refer to:
108108

@@ -119,21 +119,21 @@ This repository includes a testing framework that verifies the basic functionali
119119

120120
```bash
121121
$ cd postgresql
122-
$ make test TARGET=rhel9 VERSIONS=13
122+
$ make test TARGET=rhel10 VERSIONS=16
123123
```
124124

125125
- **CentOS Stream-based image**
126126

127127
```bash
128128
$ cd postgresql
129-
$ make test TARGET=c9s VERSIONS=13
129+
$ make test TARGET=c10s VERSIONS=16
130130
```
131131

132132
- To run a specific subset of test cases, use the `TESTS` parameter:
133133

134134
```bash
135135
$ cd postgresql
136-
$ make test VERSIONS=13 TESTS="run_general_tests run_replication_test"
136+
$ make test VERSIONS=16 TESTS="run_general_tests run_replication_test"
137137
```
138138

139139
**Note: By omitting the `VERSIONS` parameter, the build/test action will be performed on all provided versions of PostgreSQL.**

0 commit comments

Comments
 (0)