Skip to content

Commit 9a96322

Browse files
committed
[CI:DOCS]use nginx in podman tutorial
the podman tutorial refers to an old httpd image based on Fedora 29. It is x86_64 only so Apple Silicon Macs and RPI's cannot follow the tutorial. Switch to nginx Fixes: containers#20916 [NO NEW TESTS NEEDED] Signed-off-by: Brent Baude <[email protected]>
1 parent 605a29a commit 9a96322

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

docs/tutorials/podman_tutorial.md

+1-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@ For installing or building Podman, see the [installation instructions](https://p
2121
This sample container will run a very basic httpd server (named basic_httpd) that serves only its index
2222
page.
2323
```console
24-
podman run --name basic_httpd -dt -p 8080:8080/tcp -e HTTPD_VAR_RUN=/run/httpd -e HTTPD_MAIN_CONF_D_PATH=/etc/httpd/conf.d \
25-
-e HTTPD_MAIN_CONF_PATH=/etc/httpd/conf \
26-
-e HTTPD_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/httpd/ \
27-
registry.fedoraproject.org/f29/httpd /usr/bin/run-httpd
24+
podman run --name basic_httpd -dt -p 8080:80/tcp docker.io/nginx
2825
```
2926
Because the container is being run in detached mode, represented by the *-d* in the `podman run` command, Podman
3027
will print the container ID after it has run. Note that we use port forwarding to be able to

docs/tutorials/podman_tutorial_cn.md

+1-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ Podman是由libpod库提供一个实用的程序,可以被用于创建和管
2323
这个示例容器会运行一个简单的只有主页的 httpd 服务器。
2424

2525
```console
26-
podman run -dt -p 8080:8080/tcp -e HTTPD_VAR_RUN=/run/httpd -e HTTPD_MAIN_CONF_D_PATH=/etc/httpd/conf.d \
27-
-e HTTPD_MAIN_CONF_PATH=/etc/httpd/conf \
28-
-e HTTPD_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/httpd/ \
29-
registry.fedoraproject.org/f29/httpd /usr/bin/run-httpd
26+
podman run --name basic_httpd -dt -p 8080:80/tcp docker.io/nginx
3027
```
3128

3229
因为命令中的 *-d* 参数表明容器以 "detached" 模式运行,所以 Podman 会在容器运行后打印容器的 ID。

0 commit comments

Comments
 (0)