Skip to content

Commit

Permalink
deprecate c8s images, as EOL for c8s is 31th of May 2024 (#432)
Browse files Browse the repository at this point in the history
* deprecate c8s images, as EOL for c8s is 31th of May 2024
* remove mentions of CentOS7 images
* state info about c9s containerfiles in readmes
  • Loading branch information
zmiklank authored Jun 5, 2024
1 parent e58d110 commit 3628469
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 24 deletions.
19 changes: 5 additions & 14 deletions .github/workflows/build-and-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,55 +14,46 @@ jobs:
fail-fast: false
matrix:
include:
- dockerfile: "20/Dockerfile.c8s"
docker_context: 20
registry_namespace: "sclorg"
tag: "c8s"
image_name: "nodejs-20-c8s"
quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
- dockerfile: "20-minimal/Dockerfile.c8s"
docker_context: 20-minimal
registry_namespace: "sclorg"
tag: "c8s"
image_name: "nodejs-20-minimal-c8s"
quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
- dockerfile: "20/Dockerfile.c9s"
docker_context: 20
registry_namespace: "sclorg"
tag: "c9s"
image_name: "nodejs-20-c9s"
quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"

- dockerfile: "20-minimal/Dockerfile.c9s"
docker_context: 20-minimal
registry_namespace: "sclorg"
tag: "c9s"
image_name: "nodejs-20-minimal-c9s"
quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"

- dockerfile: "18/Dockerfile.fedora"
docker_context: 18
registry_namespace: "fedora"
tag: "fedora"
quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME"
quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN"
image_name: "nodejs-18"

- dockerfile: "18-minimal/Dockerfile.fedora"
docker_context: 18-minimal
registry_namespace: "fedora"
tag: "fedora"
quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME"
quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN"
image_name: "nodejs-18-minimal"

- dockerfile: "20/Dockerfile.fedora"
docker_context: 20
registry_namespace: "fedora"
tag: "fedora"
quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME"
quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN"
image_name: "nodejs-20"

- dockerfile: "20-minimal/Dockerfile.fedora"
docker_context: 20-minimal
registry_namespace: "fedora"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/container-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
version: ["14", "14-minimal", "18", "18-minimal", "20", "20-minimal" ]
os_test: [ "fedora", "rhel7", "rhel8", "rhel9", "c9s", "c8s"]
os_test: [ "fedora", "rhel7", "rhel8", "rhel9", "c9s"]
test_case: [ "container" ]

if: |
Expand Down
5 changes: 3 additions & 2 deletions 18-minimal/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ with the full-sized s2i-enabled Node.JS 18 image to build the application. The i
but compared to the full-sized Node.JS 18 image it will be missing many build-time dependencies.
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](https://quay.io/organization/centos7),
the CentOS Stream images are available in the [Quay.io](https://quay.io/organization/sclorg),
and the Fedora images are available in [Quay.io](https://quay.io/organization/fedora).
The resulting image can be run using [podman](https://github.com/containers/libpod).

Expand Down Expand Up @@ -321,5 +321,6 @@ See also
--------
Dockerfile and other sources are available on https://github.com/sclorg/s2i-nodejs-container.
In that repository you also can find another versions of Node.js environment Dockerfiles.
Dockerfile for CentOS is called `Dockerfile`, Dockerfile for RHEL7 is called `Dockerfile.rhel7`,
Dockerfile for RHEL7 is called `Dockerfile.rhel7`,
Dockerfile for CentOS Stream 9 is called `Dockerfile.c9s`,
for RHEL8 it's `Dockerfile.rhel8` and the Fedora Dockerfile is called Dockerfile.fedora.
5 changes: 3 additions & 2 deletions 18/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ NodeJS 18 container image
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.
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](https://quay.io/organization/centos7),
the CentOS Stream images are available in the [Quay.io](https://quay.io/organization/sclorg),
and the Fedora images are available in [Quay.io](https://quay.io/organization/fedora).
The resulting image can be run using [podman](https://github.com/containers/libpod).

Expand Down Expand Up @@ -249,5 +249,6 @@ See also
--------
Dockerfile and other sources are available on https://github.com/sclorg/s2i-nodejs-container.
In that repository you also can find another versions of Node.js environment Dockerfiles.
Dockerfile for CentOS is called `Dockerfile`, Dockerfile for RHEL7 is called `Dockerfile.rhel7`,
Dockerfile for RHEL7 is called `Dockerfile.rhel7`,
Dockerfile for CentOS Stream 9 is called `Dockerfile.c9s`,
for RHEL8 it's `Dockerfile.rhel8`, for RHEL9 it's `Dockerfile.rhel9` and the Fedora Dockerfile is called Dockerfile.fedora.
Empty file added 20-minimal/.exclude-c8s
Empty file.
5 changes: 3 additions & 2 deletions 20-minimal/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ with the full-sized s2i-enabled Node.JS 20 image to build the application. The i
but compared to the full-sized Node.JS 20 image it will be missing many build-time dependencies.
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](https://quay.io/organization/centos7),
the CentOS Stream images are available in the [Quay.io](https://quay.io/organization/sclorg),
and the Fedora images are available in [Quay.io](https://quay.io/organization/fedora).
The resulting image can be run using [podman](https://github.com/containers/libpod).

Expand Down Expand Up @@ -321,5 +321,6 @@ See also
--------
Dockerfile and other sources are available on https://github.com/sclorg/s2i-nodejs-container.
In that repository you also can find another versions of Node.js environment Dockerfiles.
Dockerfile for CentOS is called `Dockerfile`, Dockerfile for RHEL7 is called `Dockerfile.rhel7`,
Dockerfile for RHEL7 is called `Dockerfile.rhel7`,
Dockerfile for CentOS Stream 9 is called `Dockerfile.c9s`,
for RHEL8 it's `Dockerfile.rhel8` and the Fedora Dockerfile is called Dockerfile.fedora.
Empty file added 20/.exclude-c8s
Empty file.
5 changes: 3 additions & 2 deletions 20/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ NodeJS 20 container image
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.
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](https://quay.io/organization/centos7),
and the Fedora images are available in [Quay.io](https://quay.io/organization/fedora).
the CentOS Stream images are available in the [Quay.io](https://quay.io/organization/sclorg),
The resulting image can be run using [podman](https://github.com/containers/libpod).

Note: while the examples in this README are calling `podman`, you can replace any such calls by `docker` with the same arguments
Expand Down Expand Up @@ -249,5 +249,6 @@ See also
--------
Dockerfile and other sources are available on https://github.com/sclorg/s2i-nodejs-container.
In that repository you also can find another versions of Node.js environment Dockerfiles.
Dockerfile for CentOS is called `Dockerfile`, Dockerfile for RHEL7 is called `Dockerfile.rhel7`,
Dockerfile for RHEL7 is called `Dockerfile.rhel7`,
Dockerfile for CentOS Stream 9 is called `Dockerfile.c9s`,
for RHEL8 it's `Dockerfile.rhel8`, for RHEL9 it's `Dockerfile.rhel9` and the Fedora Dockerfile is called Dockerfile.fedora.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ RHEL versions currently supported are:

CentOS versions currently available are:
* CentOS7
* CentOS Stream 8
* CentOS Stream 9


Expand Down

0 comments on commit 3628469

Please sign in to comment.