Skip to content

Commit ac49018

Browse files
committed
Update README.md documentation. Use RHEL10 instead of RHEL8
Signed-off-by: Petr "Stone" Hracek <[email protected]>
1 parent e83b15e commit ac49018

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

2.4/root/usr/share/container-scripts/httpd/README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ Virtual hosting allows one Apache installation to serve many different Web sites
2222

2323
Usage in OpenShift
2424
------------------
25-
In this example, we assume that you are using the `rhel8/httpd-24` image, available through the `openshift/httpd:2.4-el8` imagestream tag in Openshift.
25+
In this example, we assume that you are using the `rhel10/httpd-24` image, available through the `openshift/httpd:2.4-el10` imagestream tag in Openshift.
2626
To build a simple [httpd-sample-app](https://github.com/sclorg/httpd-ex.git) application in Openshift:
2727

2828
```
29-
oc new-app openshift/httpd:2.4-el8~https://github.com/sclorg/httpd-ex.git
29+
oc new-app openshift/httpd:2.4-el10~https://github.com/sclorg/httpd-ex.git
3030
```
3131

3232
To access the application:
@@ -74,7 +74,7 @@ To use the httpd image in a Dockerfile, follow these steps:
7474
#### 1. Pull a base builder image to build on
7575

7676
```
77-
podman pull rhel8/httpd-24
77+
podman pull rhel10/httpd-24
7878
```
7979

8080
#### 2. Pull an application code
@@ -97,7 +97,7 @@ For all these three parts, you can either set up all manually and use the `httpd
9797

9898
##### 3.1. To use your own setup, create a Dockerfile with this content:
9999
```
100-
FROM registry.redhat.io/rhel8/httpd-24
100+
FROM registry.redhat.io/rhel10/httpd-24
101101
102102
# Add application sources
103103
ADD app-src/index.html /var/www/html/index.html
@@ -108,7 +108,7 @@ CMD run-httpd
108108

109109
##### 3.2. To use the Source-to-Image scripts and build an image using a Dockerfile, create a Dockerfile with this content:
110110
```
111-
FROM registry.redhat.io/rhel8/httpd-24
111+
FROM registry.redhat.io/rhel10/httpd-24
112112
113113
# Add application sources to a directory where the assemble script expects them
114114
# and set permissions so that the container runs without the root access
@@ -153,7 +153,7 @@ If you want to run the image directly and mount the static pages available in th
153153
as a container volume, execute the following command:
154154

155155
```
156-
$ podman run -d --name httpd -p 8080:8080 -v /wwwdata:/var/www:Z rhel8/httpd-24
156+
$ podman run -d --name httpd -p 8080:8080 -v /wwwdata:/var/www:Z rhel10/httpd-24
157157
```
158158

159159
This creates a container named `httpd` running the Apache HTTP Server, serving data from
@@ -177,13 +177,13 @@ If you want to run the image and mount the log files into `/wwwlogs` on the host
177177
as a container volume, execute the following command:
178178

179179
```
180-
$ podman run -d -u 0 -e HTTPD_LOG_TO_VOLUME=1 --name httpd -v /wwwlogs:/var/log/httpd24:Z rhel8/httpd-24
180+
$ podman run -d -u 0 -e HTTPD_LOG_TO_VOLUME=1 --name httpd -v /wwwlogs:/var/log/httpd24:Z rhel10/httpd-24
181181
```
182182

183183
To run an image using the `event` MPM (rather than the default `prefork`), execute the following command:
184184

185185
```
186-
$ podman run -d -e HTTPD_MPM=event --name httpd rhel8/httpd-24
186+
$ podman run -d -e HTTPD_MPM=event --name httpd rhel10/httpd-24
187187
```
188188

189189
You can also set the following mount points by passing the `-v /host:/container` flag to podman.
@@ -226,7 +226,7 @@ By default, Apache HTTP Server container runs as UID 1001. That means the volume
226226
To run the container as a different UID, use `-u` option. For example if you want to run the container as UID 1234, execute the following command:
227227

228228
```
229-
podman run -d -u 1234 rhel8/httpd-24
229+
podman run -d -u 1234 rhel10/httpd-24
230230
```
231231

232232
To log into a volume mounted directory, the container needs to be run as UID 0 (see above).

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,31 +35,31 @@ Installation
3535
------------
3636
Choose either the CentOS Stream 9, CentOS Stream 10, RHEL8 based image, RHEL9 based image, or RHEL10 based image:
3737

38-
* **RHEL8 based image**
38+
* **RHEL10 based image**
3939

4040
These images are available in the [Red Hat Container Catalog](https://catalog.redhat.com/software/containers/ubi8/httpd-24/6065b844aee24f523c207943?architecture=amd64&image=6660528072b80acc3c2193f3&container-tabs=overview).
4141
To download it run:
4242

4343
```
44-
$ podman pull registry.access.redhat.com/rhel8/httpd-24
44+
$ podman pull registry.access.redhat.com/rhel10/httpd-24
4545
```
4646
47-
To build a RHEL8 based Apache HTTP Server image, you need to run Docker build on a properly
47+
To build a RHEL10 based Apache HTTP Server image, you need to run Docker build on a properly
4848
subscribed RHEL machine.
4949
5050
```
5151
$ git clone --recursive https://github.com/sclorg/httpd-container.git
5252
$ cd httpd-container
5353
$ git submodule update --init
54-
$ make build TARGET=rhel8 VERSIONS=2.4
54+
$ make build TARGET=rhel10 VERSIONS=2.4
5555
```
5656
57-
* **CentOS Stream 9 based image**
57+
* **CentOS Stream 10 based image**
5858
5959
This image is available on DockerHub. To download it run:
6060
6161
```
62-
$ podman pull quay.io/sclorg/httpd-24-c9s
62+
$ podman pull quay.io/sclorg/httpd-24-c10s
6363
```
6464
6565
To build a CentOS based Apache HTTP Server image from scratch run:
@@ -68,7 +68,7 @@ Choose either the CentOS Stream 9, CentOS Stream 10, RHEL8 based image, RHEL9 ba
6868
$ git clone --recursive https://github.com/sclorg/httpd-container.git
6969
$ cd httpd-container
7070
$ git submodule update --init
71-
$ make build TARGET=c9s VERSIONS=2.4
71+
$ make build TARGET=c10s VERSIONS=2.4
7272
```
7373
7474
For using other versions of Apache HTTP Server, just replace the `2.4` value by particular version
@@ -98,21 +98,21 @@ Users can choose between testing Apache HTTP Server based on a RHEL or CentOS St
9898
9999
* **RHEL based image**
100100
101-
To test a RHEL8 based Apache HTTP Server image, you need to run the test on a properly
101+
To test a RHEL10 based Apache HTTP Server image, you need to run the test on a properly
102102
subscribed RHEL machine.
103103
104104
```
105105
$ cd httpd-container
106106
$ git submodule update --init
107-
$ make test TARGET=rhel8 VERSIONS=2.4
107+
$ make test TARGET=rhel10 VERSIONS=2.4
108108
```
109109
110110
* **CentOS Stream based image**
111111
112112
```
113113
$ cd httpd-container
114114
$ git submodule update --init
115-
$ make test TARGET=c9s VERSIONS=2.4
115+
$ make test TARGET=c10s VERSIONS=2.4
116116
```
117117
118118
For using other versions of Apache HTTP Server, just replace the `2.4` value by particular version

examples/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ This directory includes several examples of how to use the httpd container to se
55
Building and deploying in OpenShift
66
-------------------
77
```
8-
oc new-app rhel8/httpd-24~https://github.com/sclorg/httpd-ex.git
8+
oc new-app rhel10/httpd-24~https://github.com/sclorg/httpd-ex.git
99
```
1010

1111
Building with s2i
1212
-------------------
1313
```
14-
s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ sclorg/httpd-24-c9s httpd-sample-app
14+
s2i build https://github.com/sclorg/httpd-container.git --context-dir=examples/sample-test-app/ sclorg/httpd-24-c10s httpd-sample-app
1515
```
1616
The `s2i` binary can be obtained from https://github.com/openshift/source-to-image.
1717

0 commit comments

Comments
 (0)