Skip to content

Commit

Permalink
Update README's.
Browse files Browse the repository at this point in the history
RHEL-7 -> RHEL-8
CentOS-7 -> CentOS Stream 9

Signed-off-by: Petr "Stone" Hracek <[email protected]>
  • Loading branch information
phracek committed Jul 3, 2024
1 parent 6ed1761 commit 64a7794
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 34 deletions.
2 changes: 1 addition & 1 deletion 5.26-mod_fcgid/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
2 changes: 1 addition & 1 deletion 5.26/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
3 changes: 1 addition & 2 deletions 5.30/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down Expand Up @@ -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`.
6 changes: 3 additions & 3 deletions 5.32/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down Expand Up @@ -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`.
4 changes: 2 additions & 2 deletions 5.34/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
4 changes: 2 additions & 2 deletions 5.36/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
4 changes: 2 additions & 2 deletions 5.38/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
34 changes: 15 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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.
Expand Down Expand Up @@ -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
Expand All @@ -141,11 +137,11 @@ Repository organization
-----------------------
* **`<perl-version>`**
* **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.
Expand Down
4 changes: 2 additions & 2 deletions examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ 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
```

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:

Expand Down

0 comments on commit 64a7794

Please sign in to comment.