Update README's so RHEL-7 -> RHEL-8

and CentOS7 -> CentOS Stream 9 Signed-off-by: Petr "Stone" Hracek <[email protected]>
sclorg · Jul 2, 2024 · e473073 · e473073
1 parent d799ed2
commit e473073
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 26 deletions.
diff --git a/8.0/root/usr/share/container-scripts/mysql/README.md b/8.0/root/usr/share/container-scripts/mysql/README.md
@@ -4,7 +4,6 @@ MySQL 8.0 SQL Database Server container image
 This container image includes MySQL 8.0 SQL database server for OpenShift and general usage.
 Users can choose between RHEL, CentOS and Fedora based images.
 The RHEL images are available in the [Red Hat Container Catalog](https://access.redhat.com/containers/),
-the CentOS images are available on [Quay.io/centos7](https://quay.io/organization/centos7),
 the CentOS Stream images are available on [Quay.io/sclorg](https://quay.io/organization/sclorg),
 and the Fedora images are available in [Fedora Registry](https://quay.io/organization/fedora).
 The resulting image can be run using [podman](https://github.com/containers/libpod).
@@ -25,12 +24,12 @@ Usage
 -----
 
 For this, we will assume that you are using the MySQL 8.0 container image from the
-Red Hat Container Catalog called `rhscl/mysql-80-rhel7`.
+Red Hat Container Catalog called `rhel8/mysql-80`.
 If you want to set only the mandatory environment variables and not store
 the database in a host directory, execute the following command:
 
 ```
-$ podman run -d --name mysql_database -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 rhscl/mysql-80-rhel7
+$ podman run -d --name mysql_database -e MYSQL_USER=user -e MYSQL_PASSWORD=pass -e MYSQL_DATABASE=db -p 3306:3306 rhel8/mysql-80
 ```
 
 This will create a container named `mysql_database` running MySQL with database
@@ -199,16 +198,16 @@ Extending image
 ---------------
 This image can be extended in Openshift using the `Source` build strategy or via the standalone
 [source-to-image](https://docs.openshift.com/container-platform/4.14/openshift_images/create-images.html#images-create-s2i_create-images) application (where available).
-For this, we will assume that you are using the `rhscl/mysql-80-rhel7` image,
+For this, we will assume that you are using the `rhel8/mysql-80` image,
 available via `mysql:8.0` imagestream tag in Openshift.
 
 
-For example, to build a customized MySQL database image `my-mysql-rhel7`
+For example, to build a customized MySQL database image `my-mysql-rhel8`
 with a configuration from `https://github.com/sclorg/mysql-container/tree/master/examples/extend-image` run:
 
 ```
 $ oc new-app mysql:8.0~https://github.com/sclorg/mysql-container.git \
-	--name my-mysql-rhel7 \
+	--name my-mysql-rhel8 \
 	--context-dir=examples/extend-image \
 	--env MYSQL_OPERATIONS_USER=opuser \
 	--env MYSQL_OPERATIONS_PASSWORD=oppass \
@@ -220,7 +219,7 @@ $ oc new-app mysql:8.0~https://github.com/sclorg/mysql-container.git \
 or via s2i:
 
 ```
-$ s2i build --context-dir=examples/extend-image https://github.com/sclorg/mysql-container.git rhscl/mysql-80-rhel7 my-mysql-rhel7
+$ s2i build --context-dir=examples/extend-image https://github.com/sclorg/mysql-container.git rhel8/mysql-80 my-mysql-rhel8
 ```
 
 The directory passed to Openshift can contain these directories:
@@ -376,8 +375,7 @@ See also
 --------
 Dockerfile and other sources for this container image are available on
 https://github.com/sclorg/mysql-container.
-In that repository, the Dockerfile for CentOS is called Dockerfile, the Dockerfile
-for RHEL7 is called Dockerfile.rhel7, the Dockerfile for RHEL8 is called Dockerfile.rhel8,
+In that repository, the Dockerfile for RHEL8 is called Dockerfile.rhel8,
 the Dockerfile for RHEL9 is called Dockerfile.rhel9,
 the Dockerfile for CentOS Stream 9 is called Dockerfile.c9s,
 and the Dockerfile for Fedora is called Dockerfile.fedora.
diff --git a/README.md b/README.md
@@ -4,7 +4,6 @@ MySQL SQL Database Server Container Image
 [![Build and push images to Quay.io registry](https://github.com/sclorg/mysql-container/actions/workflows/build-and-push.yml/badge.svg)](https://github.com/sclorg/mysql-container/actions/workflows/build-and-push.yml)
 
 Images available on Quay are:
-* CentOS 7 [mysql-80](https://quay.io/repository/centos7/mysql-80-centos7)
 * CentOS Stream 9 [mysql-80](https://quay.io/repository/sclorg/mysql-80-c9s)
 * Fedora [mysql-80](https://quay.io/repository/fedora/mysql-80)
 
@@ -26,44 +25,42 @@ MySQL versions currently provided are:
 * [MySQL 8.0](8.0)
 
 RHEL versions currently supported are:
-* RHEL7
 * RHEL8
 * RHEL9
 
 CentOS versions currently supported are:
-* CentOS7
 * CentOS Stream 9
 
 
 Installation
 ------------
-Choose either the CentOS7 or RHEL7 based image:
+Choose either the CentOS Stream or RHEL7 based image:
 
-*  **RHEL7 based image**
+*  **RHEL8 based image**
 
-    These images are available in the [Red Hat Container Catalog](https://access.redhat.com/containers/#/registry.access.redhat.com/rhscl/mysql-80-rhel7).
+    These images are available in the [Red Hat Container Catalog](https://access.redhat.com/containers/#/registry.access.redhat.com/rhel8/mysql-80).
     To download it run:
 
     ```
-    $ podman pull registry.access.redhat.com/rhscl/mysql-80-rhel7
+    $ podman pull registry.access.redhat.com/rhel8/mysql-80
     ```
 
-    To build a RHEL7 based MySQL image, you need to run Docker build on a properly
+    To build a RHEL8 based MySQL image, you need to run Docker build on a properly
     subscribed RHEL machine.
 
     ```
     $ git clone --recursive https://github.com/sclorg/mysql-container.git
     $ cd mysql-container
     $ git submodule update --init
-    $ make build TARGET=rhel7 VERSIONS=8.0
+    $ make build TARGET=rhel8 VERSIONS=8.0
     ```
 
-*  **CentOS7 based image**
+*  **CentOS Stream based image**
 
     This image is available on DockerHub. To download it run:
 
     ```
-    $ podman pull quay.io/centos7/mysql-80-centos7
+    $ podman pull quay.io/sclorg/mysql-80-c9s
     ```
 
     To build a CentOS based MySQL image from scratch, run:
@@ -72,7 +69,7 @@ Choose either the CentOS7 or RHEL7 based image:
     $ git clone --recursive https://github.com/sclorg/mysql-container.git
     $ cd mysql-container
     $ git submodule update --init
-    $ make build TARGET=centos7 VERSIONS=8.0
+    $ make build TARGET=c9s VERSIONS=8.0
     ```
 
 For using other versions of MySQL, just replace the `8.0` value by particular version
@@ -102,21 +99,21 @@ Users can choose between testing MySQL based on a RHEL or CentOS image.
 
 *  **RHEL based image**
 
-    To test a RHEL7 based MySQL image, you need to run the test on a properly
+    To test a RHEL8 based MySQL image, you need to run the test on a properly
     subscribed RHEL machine.
 
     ```
     $ cd mysql-container
     $ git submodule update --init
-    $ make test TARGET=rhel7 VERSIONS=8.0
+    $ make test TARGET=rhel8 VERSIONS=8.0
     ```
 
-*  **CentOS based image**
+*  **CentOS Stream based image**
 
     ```
     $ cd mysql-container
     $ git submodule update --init
-    $ make test TARGET=centos7 VERSIONS=8.0
+    $ make test TARGET=c9s VERSIONS=8.0
     ```
 
 For using other versions of MySQL, just replace the `8.0` value by particular version

diff --git a/examples/replica/README.md b/examples/replica/README.md
@@ -56,7 +56,7 @@ Service endpoints.
 ### ReplicationController 'mysql-master'
 
 This resource defines the `PodTemplate` of the MySQL server that acts as the
-'master'. The Pod uses the `centos/mysql-57-centos7` image, but it sets the
+'master'. The Pod uses the `quay.io/sclorg/mysql-80-c9s` image, but it sets the
 special 'entrypoint' named `mysqld-master`. This will tell the MySQL image to
 configure the MySQL server as the 'master'.