From 0fc8ddf6c7dd8cdde392cd1ddf02a7f44b847bf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zuzana=20Mikl=C3=A1nkov=C3=A1?= Date: Mon, 3 Jun 2024 09:19:33 +0200 Subject: [PATCH] deprecate c8s images, as EOL for c8s is 31th of May 2024 (#299) --- .github/workflows/build-and-push.yml | 8 -------- 1.22-micro/README.md | 2 +- 1.24/.exclude-c8s | 0 1.24/README.md | 3 +-- README.md | 3 --- 5 files changed, 2 insertions(+), 14 deletions(-) create mode 100644 1.24/.exclude-c8s diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index 3635ee79..68a8530e 100644 --- a/.github/workflows/build-and-push.yml +++ b/.github/workflows/build-and-push.yml @@ -37,14 +37,6 @@ jobs: quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN" image_name: "nginx-124" - - version: "1.24" - tag: "c8s" - dockerfile: "Dockerfile.c8s" - registry_namespace: "sclorg" - quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME" - quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN" - image_name: "nginx-124-c8s" - - version: "1.24" tag: "c9s" dockerfile: "Dockerfile.c9s" diff --git a/1.22-micro/README.md b/1.22-micro/README.md index 88f21453..0b3befa2 100644 --- a/1.22-micro/README.md +++ b/1.22-micro/README.md @@ -195,6 +195,6 @@ See also Dockerfile and other sources for this container image are available on https://github.com/sclorg/nginx-container. In that repository you also can find another versions of Python environment Dockerfiles. -for RHEL8 it's `Dockerfile.rhel8`, Dockerfile for CentOS Stream 8 is called `Dockerfile.c8s`, +for RHEL8 it's `Dockerfile.rhel8`, Dockerfile for CentOS Stream 9 is called `Dockerfile.c9s` and the Fedora Dockerfile is called `Dockerfile.fedora`. diff --git a/1.24/.exclude-c8s b/1.24/.exclude-c8s new file mode 100644 index 00000000..e69de29b diff --git a/1.24/README.md b/1.24/README.md index de178739..944f4798 100644 --- a/1.24/README.md +++ b/1.24/README.md @@ -199,6 +199,5 @@ See also Dockerfile and other sources for this container image are available on https://github.com/sclorg/nginx-container. In that repository you also can find another versions of Python environment Dockerfiles. -for RHEL8 it's `Dockerfile.rhel8`, Dockerfile for CentOS Stream 8 is called `Dockerfile.c8s`, -Dockerfile for CentOS Stream 9 is called `Dockerfile.c9s` and the Fedora Dockerfile is called `Dockerfile.fedora`. +for RHEL8 it's `Dockerfile.rhel8`, Dockerfile for CentOS Stream 9 is called `Dockerfile.c9s`, and the Fedora Dockerfile is called `Dockerfile.fedora`. diff --git a/README.md b/README.md index a6c1b28f..9854eabd 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,10 @@ Nginx container images Images available on Quay are: * CentOS 7 [nginx-1.20](https://quay.io/repository/centos7/nginx-120-centos7) -* CentOS Stream 8 [nginx-1.20](https://quay.io/repository/sclorg/nginx-120-c8s) * CentOS Stream 9 [nginx-1.20](https://quay.io/repository/sclorg/nginx-120-c9s) * Fedora [nginx-1.20](https://quay.io/repository/fedora/nginx-120) * Fedora [nginx-1.22](https://quay.io/repository/fedora/nginx-122) * Fedora [nginx-1.24](https://quay.io/repository/fedora/nginx-124) -* Micro CentOS Stream 8 [nginx-1.22](https://quay.io/repository/sclorg/nginx-122-micro-c8s) * Micro CentOS Stream 9 [nginx-1.22](https://quay.io/repository/sclorg/nginx-122-micro-c9s) * Micro Fedora [nginx-1.22](https://quay.io/repository/fedora/nginx-122-micro) @@ -39,7 +37,6 @@ RHEL versions currently supported are: CentOS versions currently supported are: * CentOS7 -* CentOS Stream 8 * CentOS Stream 9