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

sclorg · Jun 3, 2024 · e137146 · e137146
1 parent 733675e
commit e137146
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 15 deletions.
diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
@@ -26,15 +26,6 @@ jobs:
             use_default_tags: 'true'
             arch: "amd64, ppc64le, s390x, arm64"
 
-          - dockerfile: "Dockerfile.c8s"
-            registry_namespace: "sclorg"
-            tag: "c8s"
-            quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
-            quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
-            suffix: "-c8s"
-            use_default_tags: 'true'
-            arch: "amd64, ppc64le, arm64"
-
           - dockerfile: "Dockerfile.f38"
             registry_namespace: "fedora"
             tag: "38"

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

diff --git a/README.md b/README.md
@@ -6,8 +6,6 @@ OpenShift base images
 Images available on Quay are:
 * CentOS 7 [s2i-core](https://quay.io/repository/centos7/s2i-core-centos7)
 * CentOS 7 [s2i-base](https://quay.io/repository/centos7/s2i-base-centos7)
-* CentOS Stream 8 [s2i-core](https://quay.io/repository/sclorg/s2i-core-c8s)
-* CentOS Stream 8 [s2i-base](https://quay.io/repository/sclorg/s2i-base-c8s)
 * CentOS Stream 9 [s2i-core](https://quay.io/repository/sclorg/s2i-core-c9s)
 * CentOS Stream 9 [s2i-base](https://quay.io/repository/sclorg/s2i-base-c9s)
 * Fedora [s2i-core](https://quay.io/repository/fedora/s2i-core)
@@ -28,7 +26,6 @@ RHEL versions currently supported are:
 
 CentOS versions currently supported are:
 * CentOS7
-* CentOS Stream 8
 * CentOS Stream 9
 
 For more information about contributing, see

diff --git a/base/.exclude-c8s b/base/.exclude-c8s
diff --git a/base/README.md b/base/README.md
@@ -103,5 +103,5 @@ See also
 Dockerfile and other sources are available on https://github.com/sclorg/s2i-base-container.
 In that repository you also can find another variants of S2I base Dockerfiles.
 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 RHEL9 is called Dockerfile.rhel9, the Dockerfile for CentOS Stream 8 is called Dockerfile.c8s,
+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 Dockerfile.fedora.
diff --git a/core/.exclude-c8s b/core/.exclude-c8s
diff --git a/core/README.md b/core/README.md
@@ -84,5 +84,5 @@ See also
 Dockerfile and other sources are available on https://github.com/sclorg/s2i-base-container.
 In that repository you also can find another variants of S2I Base Dockerfiles.
 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 RHEL9 is called Dockerfile.rhel9, the Dockerfile for CentOS Stream 8 is called Dockerfile.c8s,
+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 Dockerfile.fedora.