Skip to content

Commit 3628469

Browse files
authored
deprecate c8s images, as EOL for c8s is 31th of May 2024 (#432)
* deprecate c8s images, as EOL for c8s is 31th of May 2024 * remove mentions of CentOS7 images * state info about c9s containerfiles in readmes
1 parent e58d110 commit 3628469

File tree

9 files changed

+18
-24
lines changed

9 files changed

+18
-24
lines changed

.github/workflows/build-and-push.yml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,55 +14,46 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
include:
17-
- dockerfile: "20/Dockerfile.c8s"
18-
docker_context: 20
19-
registry_namespace: "sclorg"
20-
tag: "c8s"
21-
image_name: "nodejs-20-c8s"
22-
quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
23-
quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
24-
- dockerfile: "20-minimal/Dockerfile.c8s"
25-
docker_context: 20-minimal
26-
registry_namespace: "sclorg"
27-
tag: "c8s"
28-
image_name: "nodejs-20-minimal-c8s"
29-
quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
30-
quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
3117
- dockerfile: "20/Dockerfile.c9s"
3218
docker_context: 20
3319
registry_namespace: "sclorg"
3420
tag: "c9s"
3521
image_name: "nodejs-20-c9s"
3622
quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
3723
quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
24+
3825
- dockerfile: "20-minimal/Dockerfile.c9s"
3926
docker_context: 20-minimal
4027
registry_namespace: "sclorg"
4128
tag: "c9s"
4229
image_name: "nodejs-20-minimal-c9s"
4330
quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
4431
quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
32+
4533
- dockerfile: "18/Dockerfile.fedora"
4634
docker_context: 18
4735
registry_namespace: "fedora"
4836
tag: "fedora"
4937
quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME"
5038
quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN"
5139
image_name: "nodejs-18"
40+
5241
- dockerfile: "18-minimal/Dockerfile.fedora"
5342
docker_context: 18-minimal
5443
registry_namespace: "fedora"
5544
tag: "fedora"
5645
quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME"
5746
quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN"
5847
image_name: "nodejs-18-minimal"
48+
5949
- dockerfile: "20/Dockerfile.fedora"
6050
docker_context: 20
6151
registry_namespace: "fedora"
6252
tag: "fedora"
6353
quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME"
6454
quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN"
6555
image_name: "nodejs-20"
56+
6657
- dockerfile: "20-minimal/Dockerfile.fedora"
6758
docker_context: 20-minimal
6859
registry_namespace: "fedora"

.github/workflows/container-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
version: ["14", "14-minimal", "18", "18-minimal", "20", "20-minimal" ]
17-
os_test: [ "fedora", "rhel7", "rhel8", "rhel9", "c9s", "c8s"]
17+
os_test: [ "fedora", "rhel7", "rhel8", "rhel9", "c9s"]
1818
test_case: [ "container" ]
1919

2020
if: |

18-minimal/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ with the full-sized s2i-enabled Node.JS 18 image to build the application. The i
66
but compared to the full-sized Node.JS 18 image it will be missing many build-time dependencies.
77
Users can choose between RHEL, CentOS and Fedora based images.
88
The RHEL images are available in the [Red Hat Container Catalog](https://access.redhat.com/containers/),
9-
the CentOS images are available on [Quay.io](https://quay.io/organization/centos7),
9+
the CentOS Stream images are available in the [Quay.io](https://quay.io/organization/sclorg),
1010
and the Fedora images are available in [Quay.io](https://quay.io/organization/fedora).
1111
The resulting image can be run using [podman](https://github.com/containers/libpod).
1212

@@ -321,5 +321,6 @@ See also
321321
--------
322322
Dockerfile and other sources are available on https://github.com/sclorg/s2i-nodejs-container.
323323
In that repository you also can find another versions of Node.js environment Dockerfiles.
324-
Dockerfile for CentOS is called `Dockerfile`, Dockerfile for RHEL7 is called `Dockerfile.rhel7`,
324+
Dockerfile for RHEL7 is called `Dockerfile.rhel7`,
325+
Dockerfile for CentOS Stream 9 is called `Dockerfile.c9s`,
325326
for RHEL8 it's `Dockerfile.rhel8` and the Fedora Dockerfile is called Dockerfile.fedora.

18/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ NodeJS 18 container image
44
This container image includes Node.JS 18 as a [S2I](https://github.com/openshift/source-to-image) base image for your Node.JS 18 applications.
55
Users can choose between RHEL, CentOS and Fedora based images.
66
The RHEL images are available in the [Red Hat Container Catalog](https://access.redhat.com/containers/),
7-
the CentOS images are available on [Quay.io](https://quay.io/organization/centos7),
7+
the CentOS Stream images are available in the [Quay.io](https://quay.io/organization/sclorg),
88
and the Fedora images are available in [Quay.io](https://quay.io/organization/fedora).
99
The resulting image can be run using [podman](https://github.com/containers/libpod).
1010

@@ -249,5 +249,6 @@ See also
249249
--------
250250
Dockerfile and other sources are available on https://github.com/sclorg/s2i-nodejs-container.
251251
In that repository you also can find another versions of Node.js environment Dockerfiles.
252-
Dockerfile for CentOS is called `Dockerfile`, Dockerfile for RHEL7 is called `Dockerfile.rhel7`,
252+
Dockerfile for RHEL7 is called `Dockerfile.rhel7`,
253+
Dockerfile for CentOS Stream 9 is called `Dockerfile.c9s`,
253254
for RHEL8 it's `Dockerfile.rhel8`, for RHEL9 it's `Dockerfile.rhel9` and the Fedora Dockerfile is called Dockerfile.fedora.

20-minimal/.exclude-c8s

Whitespace-only changes.

20-minimal/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ with the full-sized s2i-enabled Node.JS 20 image to build the application. The i
66
but compared to the full-sized Node.JS 20 image it will be missing many build-time dependencies.
77
Users can choose between RHEL, CentOS and Fedora based images.
88
The RHEL images are available in the [Red Hat Container Catalog](https://access.redhat.com/containers/),
9-
the CentOS images are available on [Quay.io](https://quay.io/organization/centos7),
9+
the CentOS Stream images are available in the [Quay.io](https://quay.io/organization/sclorg),
1010
and the Fedora images are available in [Quay.io](https://quay.io/organization/fedora).
1111
The resulting image can be run using [podman](https://github.com/containers/libpod).
1212

@@ -321,5 +321,6 @@ See also
321321
--------
322322
Dockerfile and other sources are available on https://github.com/sclorg/s2i-nodejs-container.
323323
In that repository you also can find another versions of Node.js environment Dockerfiles.
324-
Dockerfile for CentOS is called `Dockerfile`, Dockerfile for RHEL7 is called `Dockerfile.rhel7`,
324+
Dockerfile for RHEL7 is called `Dockerfile.rhel7`,
325+
Dockerfile for CentOS Stream 9 is called `Dockerfile.c9s`,
325326
for RHEL8 it's `Dockerfile.rhel8` and the Fedora Dockerfile is called Dockerfile.fedora.

20/.exclude-c8s

Whitespace-only changes.

20/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ NodeJS 20 container image
44
This container image includes Node.JS 20 as a [S2I](https://github.com/openshift/source-to-image) base image for your Node.JS 20 applications.
55
Users can choose between RHEL, CentOS and Fedora based images.
66
The RHEL images are available in the [Red Hat Container Catalog](https://access.redhat.com/containers/),
7-
the CentOS images are available on [Quay.io](https://quay.io/organization/centos7),
87
and the Fedora images are available in [Quay.io](https://quay.io/organization/fedora).
8+
the CentOS Stream images are available in the [Quay.io](https://quay.io/organization/sclorg),
99
The resulting image can be run using [podman](https://github.com/containers/libpod).
1010

1111
Note: while the examples in this README are calling `podman`, you can replace any such calls by `docker` with the same arguments
@@ -249,5 +249,6 @@ See also
249249
--------
250250
Dockerfile and other sources are available on https://github.com/sclorg/s2i-nodejs-container.
251251
In that repository you also can find another versions of Node.js environment Dockerfiles.
252-
Dockerfile for CentOS is called `Dockerfile`, Dockerfile for RHEL7 is called `Dockerfile.rhel7`,
252+
Dockerfile for RHEL7 is called `Dockerfile.rhel7`,
253+
Dockerfile for CentOS Stream 9 is called `Dockerfile.c9s`,
253254
for RHEL8 it's `Dockerfile.rhel8`, for RHEL9 it's `Dockerfile.rhel9` and the Fedora Dockerfile is called Dockerfile.fedora.

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ RHEL versions currently supported are:
3636

3737
CentOS versions currently available are:
3838
* CentOS7
39-
* CentOS Stream 8
4039
* CentOS Stream 9
4140

4241

0 commit comments

Comments
 (0)