From 64a7794db9dc140a132b8f30fb08c680e1819a87 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Thu, 27 Jun 2024 14:59:25 +0200 Subject: [PATCH] Update README's. RHEL-7 -> RHEL-8 CentOS-7 -> CentOS Stream 9 Signed-off-by: Petr "Stone" Hracek --- 5.26-mod_fcgid/README.md | 2 +- 5.26/README.md | 2 +- 5.30/README.md | 3 +-- 5.32/README.md | 6 +++--- 5.34/README.md | 4 ++-- 5.36/README.md | 4 ++-- 5.38/README.md | 4 ++-- README.md | 34 +++++++++++++++------------------- examples/README.md | 4 ++-- 9 files changed, 29 insertions(+), 34 deletions(-) diff --git a/5.26-mod_fcgid/README.md b/5.26-mod_fcgid/README.md index 1d7853e..904273c 100644 --- a/5.26-mod_fcgid/README.md +++ b/5.26-mod_fcgid/README.md @@ -218,4 +218,4 @@ See also Dockerfile and other sources are available on https://github.com/sclorg/s2i-perl-container. In that repository you also can find another versions of Perl environment Dockerfiles. -Dockerfile for CentOS is called `Dockerfile`, Dockerfile for RHEL7 is called `Dockerfile.rhel7`, for RHEL8 `Dockerfile.rhel8` and the Fedora Dockerfile is called `Dockerfile.fedora`. +Dockerfile for RHEL8 is called `Dockerfile.rhel8` and the Fedora Dockerfile is called `Dockerfile.fedora`. diff --git a/5.26/README.md b/5.26/README.md index 9ffbb56..906909f 100644 --- a/5.26/README.md +++ b/5.26/README.md @@ -199,4 +199,4 @@ See also Dockerfile and other sources are available on https://github.com/sclorg/s2i-perl-container. In that repository you also can find another versions of Perl environment Dockerfiles. -Dockerfile for CentOS is called `Dockerfile`, Dockerfile for RHEL7 is called `Dockerfile.rhel7`, for RHEL8 `Dockerfile.rhel8` and the Fedora Dockerfile is called `Dockerfile.fedora`. +Dockerfile for RHEL8 `Dockerfile.rhel8` and the Fedora Dockerfile is called `Dockerfile.fedora`. diff --git a/5.30/README.md b/5.30/README.md index b7cf90a..2a83e21 100644 --- a/5.30/README.md +++ b/5.30/README.md @@ -4,7 +4,6 @@ Perl 5.30 container image This container image includes Perl 5.30 as an [S2I](https://github.com/openshift/source-to-image) base image for your Perl 5.30 applications. Users can choose between RHEL, CentOS and Fedora based builder 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 [Fedora Registry](https://registry.fedoraproject.org/). The resulting image can be run using [podman](https://github.com/containers/libpod). @@ -199,4 +198,4 @@ See also Dockerfile and other sources are available on https://github.com/sclorg/s2i-perl-container. In that repository you also can find another versions of Perl environment Dockerfiles. -Dockerfile for CentOS is called `Dockerfile`, Dockerfile for RHEL7 is called `Dockerfile.rhel7` and the Fedora Dockerfile is called `Dockerfile.fedora`. +The Fedora Dockerfile is called `Dockerfile.fedora`. diff --git a/5.32/README.md b/5.32/README.md index 0fd620e..a11e7f8 100644 --- a/5.32/README.md +++ b/5.32/README.md @@ -4,7 +4,7 @@ Perl 5.32 container image This container image includes Perl 5.32 as an [S2I](https://github.com/openshift/source-to-image) base image for your Perl 5.32 applications. Users can choose between RHEL, CentOS and Fedora based builder 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 on [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). @@ -218,5 +218,5 @@ See also Dockerfile and other sources are available on https://github.com/sclorg/s2i-perl-container. In that repository you also can find another versions of Perl environment Dockerfiles. -Dockerfile for CentOS is called `Dockerfile`, Dockerfile for RHEL7 is called `Dockerfile.rhel7`, for RHEL8 `Dockerfile.rhel8`, -for CentOS Stream 9 `Dockerfile.c9s`, for RHEL9 `Dockerfile.rhel9`, and the Fedora Dockerfile is called `Dockerfile.fedora`. +Dockerfile for RHEL8 is called `Dockerfile.rhel8`, Dockerfile for CentOS Stream 9 is called `Dockerfile.c9s`, +Dockerfile for RHEL9 is called `Dockerfile.rhel9`, and the Fedora Dockerfile is called `Dockerfile.fedora`. diff --git a/5.34/README.md b/5.34/README.md index 99bad52..4c241a9 100644 --- a/5.34/README.md +++ b/5.34/README.md @@ -216,5 +216,5 @@ See also Dockerfile and other sources are available on https://github.com/sclorg/s2i-perl-container. In that repository you also can find another versions of Perl environment Dockerfiles. -Dockerfile for CentOS is called `Dockerfile`, Dockerfile for RHEL7 is called `Dockerfile.rhel7`, for RHEL8 `Dockerfile.rhel8`, -for CentOS Stream 9 `Dockerfile.c9s` and the Fedora Dockerfile is called `Dockerfile.fedora`. +Dockerfile for RHEL8 `Dockerfile.rhel8`, Dockerfile for CentOS Stream 9 is called `Dockerfile.c9s`, +and the Fedora Dockerfile is called `Dockerfile.fedora`. diff --git a/5.36/README.md b/5.36/README.md index ad6e35a..16063c6 100644 --- a/5.36/README.md +++ b/5.36/README.md @@ -216,5 +216,5 @@ See also Dockerfile and other sources are available on https://github.com/sclorg/s2i-perl-container. In that repository you also can find another versions of Perl environment Dockerfiles. -Dockerfile for CentOS is called `Dockerfile`, Dockerfile for RHEL7 is called `Dockerfile.rhel7`, for RHEL8 `Dockerfile.rhel8`, -for CentOS Stream 9 `Dockerfile.c9s` and the Fedora Dockerfile is called `Dockerfile.fedora`. +Dockerfile for RHEL8 is called `Dockerfile.rhel8`, Dockerfile for CentOS Stream 9 is called `Dockerfile.c9s`, +and the Fedora Dockerfile is called `Dockerfile.fedora`. diff --git a/5.38/README.md b/5.38/README.md index 8043b4f..36a72a8 100644 --- a/5.38/README.md +++ b/5.38/README.md @@ -216,5 +216,5 @@ See also Dockerfile and other sources are available on https://github.com/sclorg/s2i-perl-container. In that repository you also can find another versions of Perl environment Dockerfiles. -Dockerfile for CentOS is called `Dockerfile`, Dockerfile for RHEL7 is called `Dockerfile.rhel7`, for RHEL8 `Dockerfile.rhel8`, -for CentOS Stream 9 `Dockerfile.c9s` and the Fedora Dockerfile is called `Dockerfile.fedora`. +Dockerfile for RHEL8 is called `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 83442d3..8fd6d70 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,6 @@ Perl container images [![Build and push images to Quay.io registry](https://github.com/sclorg/s2i-perl-container/actions/workflows/build-and-push.yml/badge.svg)](https://github.com/sclorg/s2i-perl-container/actions/workflows/build-and-push.yml) Images available on Quay are: -* CentOS 7 [perl-5.26](https://quay.io/repository/centos7/perl-526-centos7) -* CentOS 7 [perl-5.30](https://quay.io/repository/centos7/perl-530-centos7) * CentOS Stream 9 [perl-5.32](https://quay.io/repository/sclorg/perl-532-c9s) * Fedora [perl-5.32](https://quay.io/repository/fedora/perl-532) * Fedora [perl-5.34](https://quay.io/repository/fedora/perl-534) @@ -38,26 +36,24 @@ Perl versions currently provided: * [perl-5.38](5.38) RHEL versions currently supported: -* RHEL7 * RHEL8 * RHEL9 CentOS versions currently supported: -* CentOS7 * CentOS Stream 9 Installation ------------ -To build a Perl image, choose either the CentOS or RHEL based image: +To build a Perl image, choose either the CentOS Stream or RHEL based image: * **RHEL based image** - These images are available in the [Red Hat Container Catalog](https://access.redhat.com/containers/#/registry.access.redhat.com/rhscl/perl-530-rhel7). + These images are available in the [Red Hat Container Catalog](https://access.redhat.com/containers/#/registry.access.redhat.com/rhel8/perl-532). To download it run: ``` - $ podman pull registry.access.redhat.com/rhscl/perl-530-rhel7 + $ podman pull registry.access.redhat.com/rhel8/perl-532 ``` To build a RHEL based Perl image, you need to run the build on a properly @@ -66,23 +62,23 @@ To build a Perl image, choose either the CentOS or RHEL based image: ``` $ git clone --recursive https://github.com/sclorg/s2i-perl-container.git $ cd s2i-perl-container - $ make build TARGET=rhel7 VERSIONS=5.30 + $ make build TARGET=rhel8 VERSIONS=5.32 ``` -* **CentOS based image** +* **CentOS Stream based image** - This image is available on DockerHub. To download the perl-5.30 image, run: + This image is available on DockerHub. To download the perl-5.32 image, run: ``` - $ podman pull docker.io/centos7/perl-530-centos7 + $ podman pull quay.io/sclorg/perl-532 ``` - To build the perl-5.30 image from scratch run: + To build the perl-5.32 image from scratch run: ``` $ git clone --recursive https://github.com/sclorg/s2i-perl-container.git $ cd s2i-perl-container - $ make build TARGET=centos7 VERSIONS=5.30 + $ make build TARGET=c9s VERSIONS=5.32 ``` Note: while the installation steps are calling `podman`, you can replace any such calls by `docker` with the same arguments. @@ -123,14 +119,14 @@ Users can choose between testing a Perl test application based on a RHEL or Cent ``` $ cd s2i-perl-container - $ make test TARGET=rhel7 VERSIONS=5.30 + $ make test TARGET=rhel8 VERSIONS=5.32 ``` -* **CentOS based image** +* **CentOS Stream based image** ``` $ cd s2i-perl-container - $ make test TARGET=centos7 VERSIONS=5.30 + $ make test TARGET=c9s VERSIONS=5.32 ``` **Notice: By omitting the `VERSIONS` parameter, the build/test action will be performed @@ -141,11 +137,11 @@ Repository organization ----------------------- * **``** - * **Dockerfile** + * **Dockerfile.c9s** - CentOS based Dockerfile. + CentOS Stream based Dockerfile. - * **Dockerfile.rhel7** + * **Dockerfile.rhel8** RHEL based Dockerfile. In order to perform build or test actions on this Dockerfile you need to run the action on a properly subscribed RHEL machine. diff --git a/examples/README.md b/examples/README.md index 352b14d..79ac1a6 100644 --- a/examples/README.md +++ b/examples/README.md @@ -8,7 +8,7 @@ The application serves a single static html page via perl, while also installing To build and run the application: ``` -$ s2i build --context-dir=examples/sample-test-app https://github.com/sclorg/s2i-perl-container centos/perl-524-centos7 myperlimage +$ s2i build --context-dir=examples/sample-test-app https://github.com/sclorg/s2i-perl-container sclorg/perl-532-c9s myperlimage $ docker run -p 8080:8080 myperlimage $ # browse to http://localhost:8080 ``` @@ -16,7 +16,7 @@ $ # browse to http://localhost:8080 You can also build and deploy the application on OpenShift, assuming you have a working `oc` command line environment connected to your cluster already: -`$ oc new-app --context-dir=examples/sample-test-app centos/perl-524-centos7~https://github.com/sclorg/s2i-perl-container` +`$ oc new-app --context-dir=examples/sample-test-app sclorg/perl-532-c9s~https://github.com/sclorg/s2i-perl-container` You can also deploy the sample template for the application: