deprecate c8s images, as EOL for c8s is 31th of May 2024 (#239)

also remove mentions of CentOS7
sclorg · Jun 4, 2024 · 6c66416 · 6c66416
1 parent e93ca5d
commit 6c66416
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 100 deletions.
diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
@@ -20,36 +20,21 @@ jobs:
             quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
             tag: "c9s"
             image_name: "mariadb-1011-c9s"
-          - dockerfile: "10.11/Dockerfile.c8s"
-            registry_namespace: "sclorg"
-            quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
-            quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
-            tag: "c8s"
-            image_name: "mariadb-1011-c8s"
+
           - dockerfile: "10.5/Dockerfile.c9s"
             registry_namespace: "sclorg"
             quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
             tag: "c9s"
             image_name: "mariadb-105-c9s"
-          - dockerfile: "10.5/Dockerfile.c8s"
-            registry_namespace: "sclorg"
-            quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
-            quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
-            tag: "c8s"
-            image_name: "mariadb-105-c8s"
-          - dockerfile: "10.3/Dockerfile.c8s"
-            registry_namespace: "sclorg"
-            quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
-            quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
-            tag: "c8s"
-            image_name: "mariadb-103-c8s"
+
           - dockerfile: "10.5/Dockerfile.fedora"
             registry_namespace: "fedora"
             quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN"
             tag: "fedora"
             image_name: "mariadb-105"
+
           - dockerfile: "10.11/Dockerfile.fedora"
             registry_namespace: "fedora"
             quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME"

diff --git a/.github/workflows/container-tests.yml b/.github/workflows/container-tests.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         version: [ "10.3", "10.5", "10.11" ]
-        os_test: [ "fedora", "rhel7", "rhel8", "rhel9", "c9s", "c8s"]
+        os_test: [ "fedora", "rhel7", "rhel8", "rhel9", "c9s"]
         test_case: [ "container" ]
 
     if: |

diff --git a/10.11/.exclude-c8s b/10.11/.exclude-c8s
diff --git a/10.11/root/usr/share/container-scripts/mysql/README.md b/10.11/root/usr/share/container-scripts/mysql/README.md
@@ -360,8 +360,7 @@ See also
 --------
 Dockerfile and other sources for this container image are available on
 https://github.com/sclorg/mariadb-container.
-In that repository, the Dockerfile for CentOS is called Dockerfile, 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 8 is called Dockerfile.c8s,
 the Dockerfile for CentOS Stream 9 is called Dockerfile.c9s,
 and the Dockerfile for Fedora is called Dockerfile.fedora.
diff --git a/10.3/.exclude-c8s b/10.3/.exclude-c8s
diff --git a/10.3/root/usr/share/container-scripts/mysql/README.md b/10.3/root/usr/share/container-scripts/mysql/README.md
@@ -361,8 +361,7 @@ See also
 --------
 Dockerfile and other sources for this container image are available on
 https://github.com/sclorg/mariadb-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,
-the Dockerfile for CentOS Stream 8 is called Dockerfile.c8s,
+In that repository, the Dockerfile for RHEL7 is called Dockerfile.rhel7,
+the Dockerfile for RHEL8 is called Dockerfile.rhel8,
 the Dockerfile for CentOS Stream 9 is called Dockerfile.c9s,
 and the Dockerfile for Fedora is called Dockerfile.fedora.
diff --git a/10.5/.exclude-c8s b/10.5/.exclude-c8s
diff --git a/10.5/root/usr/share/container-scripts/mysql/README.md b/10.5/root/usr/share/container-scripts/mysql/README.md
@@ -361,9 +361,8 @@ See also
 --------
 Dockerfile and other sources for this container image are available on
 https://github.com/sclorg/mariadb-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 RHEL7 is called Dockerfile.rhel7,
+the Dockerfile for RHEL8 is called Dockerfile.rhel8,
 the Dockerfile for RHEL9 is called Dockerfile.rhel9,
-the Dockerfile for CentOS Stream 8 is called Dockerfile.c8s,
 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,19 +4,14 @@ MariaDB SQL Database Server Docker Image
 [![Build and push images to Quay.io registry](https://github.com/sclorg/mariadb-container/actions/workflows/build-and-push.yml/badge.svg)](https://github.com/sclorg/mariadb-container/actions/workflows/build-and-push.yml)
 
 Images available on Quay are:
-* CentOS 7 [mariadb-103](https://quay.io/repository/centos7/mariadb-103-centos7)
-* CentOS 7 [mariadb-105](https://quay.io/repository/centos7/mariadb-105-centos7)
-* CentOS Stream 8 [mariadb-103](https://quay.io/repository/sclorg/mariadb-103-c8s)
-* CentOS Stream 8 [mariadb-105](https://quay.io/repository/sclorg/mariadb-105-c8s)
 * CentOS Stream 9 [mariadb-105](https://quay.io/repository/sclorg/mariadb-105-c9s)
-* CentOS Stream 8 [mariadb-1011](https://quay.io/repository/sclorg/mariadb-1011-c8s)
 * CentOS Stream 9 [mariadb-1011](https://quay.io/repository/sclorg/mariadb-1011-c9s)
 * Fedora [mariadb-103](https://quay.io/repository/fedora/mariadb-103)
 * Fedora [mariadb-105](https://quay.io/repository/fedora/mariadb-105)
 * Fedora [mariadb-1011](https://quay.io/repository/fedora/mariadb-1011)
 
 This repository contains Dockerfiles for MariaDB images for OpenShift and general usage.
-Users can choose between RHEL, Fedora and CentOS based images.
+Users can choose between RHEL, Fedora and CentOS Stream based images.
 
 MariaDB container is very similar to the MySQL container available at
 [https://github.com/sclorg/mysql-container](https://github.com/sclorg/mysql-container).
@@ -43,14 +38,11 @@ RHEL versions currently supported are:
 * RHEL9
 
 CentOS versions currently supported are:
-* CentOS7
-* CentOS Stream 8
 * CentOS Stream 9
 
 
 Installation
 ----------------------
-Choose either the CentOS7 or RHEL7 based image:
 
 *  **RHEL7 based image**
 
@@ -71,23 +63,6 @@ Choose either the CentOS7 or RHEL7 based image:
     $ make build TARGET=rhel7 VERSIONS=10.5
     ```
 
-*  **CentOS7 based image**
-
-    This image is available on DockerHub. To download it run:
-
-    ```
-    $ podman pull quay.io/centos7/mariadb-103-centos7
-    ```
-
-    To build a CentOS based MariaDB image from scratch, run:
-
-    ```
-    $ git clone --recursive https://github.com/sclorg/mariadb-container.git
-    $ cd mariadb-container
-    $ git submodule update --init
-    $ make build TARGET=centos7 VERSIONS=10.3
-    ```
-
 For using other versions of MariaDB, just replace the `10.3` value by particular version
 in the commands above.
 
@@ -129,14 +104,6 @@ Users can choose between testing MariaDB based on a RHEL or CentOS image.
     $ make test TARGET=rhel7 VERSIONS=10.5
     ```
 
-*  **CentOS based image**
-
-    ```
-    $ cd mariadb-container
-    $ git submodule update --init
-    $ make test TARGET=centos7 VERSIONS=10.3
-    ```
-
 For using other versions of MariaDB, just replace the `10.3` value by particular version
 in the commands above.
 

diff --git a/imagestreams/imagestreams.yaml b/imagestreams/imagestreams.yaml
@@ -11,9 +11,6 @@
   - filename: mariadb-centos.json
     latest: "10.11-el9"
     distros:
-      - name: CentOS Stream 8
-        app_versions: ["10.3", "10.5"]
-
       - name: CentOS Stream 9
         app_versions: ["10.5", "10.11"]
 

diff --git a/imagestreams/mariadb-centos.json b/imagestreams/mariadb-centos.json
@@ -9,42 +9,6 @@
   },
   "spec": {
     "tags": [
-      {
-        "name": "10.3-el8",
-        "annotations": {
-          "openshift.io/display-name": "MariaDB 10.3 (CentOS Stream 8)",
-          "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "description": "Provides a MariaDB 10.3 database on CentOS Stream 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.",
-          "iconClass": "icon-mariadb",
-          "tags": "database,mariadb",
-          "version": "10.3"
-        },
-        "from": {
-          "kind": "DockerImage",
-          "name": "quay.io/sclorg/mariadb-103-c8s:latest"
-        },
-        "referencePolicy": {
-          "type": "Local"
-        }
-      },
-      {
-        "name": "10.5-el8",
-        "annotations": {
-          "openshift.io/display-name": "MariaDB 10.5 (CentOS Stream 8)",
-          "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "description": "Provides a MariaDB 10.5 database on CentOS Stream 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.",
-          "iconClass": "icon-mariadb",
-          "tags": "database,mariadb",
-          "version": "10.5"
-        },
-        "from": {
-          "kind": "DockerImage",
-          "name": "quay.io/sclorg/mariadb-105-c8s:latest"
-        },
-        "referencePolicy": {
-          "type": "Local"
-        }
-      },
       {
         "name": "10.5-el9",
         "annotations": {