diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index 90290ae1..11ca58c8 100644 --- a/.github/workflows/build-and-push.yml +++ b/.github/workflows/build-and-push.yml @@ -14,20 +14,6 @@ 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" @@ -35,6 +21,7 @@ jobs: 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" @@ -42,6 +29,7 @@ jobs: 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" @@ -49,6 +37,7 @@ jobs: 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" @@ -56,6 +45,7 @@ jobs: 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" @@ -63,6 +53,7 @@ jobs: 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" diff --git a/.github/workflows/container-tests.yml b/.github/workflows/container-tests.yml index d02e4ffd..a844e779 100644 --- a/.github/workflows/container-tests.yml +++ b/.github/workflows/container-tests.yml @@ -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: | diff --git a/18-minimal/README.md b/18-minimal/README.md index 38ba7982..eb39a5de 100644 --- a/18-minimal/README.md +++ b/18-minimal/README.md @@ -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). @@ -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. diff --git a/18/README.md b/18/README.md index 1908cd16..e09ef62f 100644 --- a/18/README.md +++ b/18/README.md @@ -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). @@ -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. diff --git a/20-minimal/.exclude-c8s b/20-minimal/.exclude-c8s new file mode 100644 index 00000000..e69de29b diff --git a/20-minimal/README.md b/20-minimal/README.md index da5253ae..afe0fe18 100644 --- a/20-minimal/README.md +++ b/20-minimal/README.md @@ -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). @@ -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. diff --git a/20/.exclude-c8s b/20/.exclude-c8s new file mode 100644 index 00000000..e69de29b diff --git a/20/README.md b/20/README.md index 9dcf8b52..b0cbec0f 100644 --- a/20/README.md +++ b/20/README.md @@ -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 @@ -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. diff --git a/README.md b/README.md index 9209ea71..18783d0d 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,6 @@ RHEL versions currently supported are: CentOS versions currently available are: * CentOS7 -* CentOS Stream 8 * CentOS Stream 9