Skip to content

Commit 8ae0579

Browse files
authored
Remove RHEL7 and scl_enable (#624)
* Remove mentions of RHEL 7 and update READMEs * Remove scl_enable * Update dist-gen files to generate desired results * Removed scl_enable from src and the pre_build_distgen hook
1 parent 36708b7 commit 8ae0579

File tree

22 files changed

+51
-89
lines changed

22 files changed

+51
-89
lines changed

12/root/usr/libexec/check-container

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
# wait for it (this script might run forever, we expect that the timeout is
88
# maintained externally).
99

10-
test -z "$ENABLED_COLLECTIONS" || . scl_source enable $ENABLED_COLLECTIONS
11-
1210
if test x"$1" = "x--live"; then
1311
# Since livenessProbe is about to detect container deadlocks, and we
1412
# so far don't know about real deadlocks to be detected -- we keep

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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+
rhel8/postgresql-12
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.
@@ -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.

12/root/usr/share/container-scripts/postgresql/scl_enable

Lines changed: 0 additions & 3 deletions
This file was deleted.

13/root/usr/libexec/check-container

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
# wait for it (this script might run forever, we expect that the timeout is
88
# maintained externally).
99

10-
test -z "$ENABLED_COLLECTIONS" || . scl_source enable $ENABLED_COLLECTIONS
11-
1210
if test x"$1" = "x--live"; then
1311
# Since livenessProbe is about to detect container deadlocks, and we
1412
# so far don't know about real deadlocks to be detected -- we keep

13/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-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, 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.

13/root/usr/share/container-scripts/postgresql/scl_enable

Lines changed: 0 additions & 3 deletions
This file was deleted.

15/root/usr/libexec/check-container

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
# wait for it (this script might run forever, we expect that the timeout is
88
# maintained externally).
99

10-
test -z "$ENABLED_COLLECTIONS" || . scl_source enable $ENABLED_COLLECTIONS
11-
1210
if test x"$1" = "x--live"; then
1311
# Since livenessProbe is about to detect container deadlocks, and we
1412
# so far don't know about real deadlocks to be detected -- we keep

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, 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.

15/root/usr/share/container-scripts/postgresql/scl_enable

Lines changed: 0 additions & 3 deletions
This file was deleted.

16/root/usr/libexec/check-container

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
# wait for it (this script might run forever, we expect that the timeout is
88
# maintained externally).
99

10-
test -z "$ENABLED_COLLECTIONS" || . scl_source enable $ENABLED_COLLECTIONS
11-
1210
if test x"$1" = "x--live"; then
1311
# Since livenessProbe is about to detect container deadlocks, and we
1412
# so far don't know about real deadlocks to be detected -- we keep

0 commit comments

Comments
 (0)