From c71c2c99b25b0ee487f3b7094624af66411eb56c Mon Sep 17 00:00:00 2001 From: xiezhh23 <1260163954@qq.com> Date: Wed, 27 Dec 2023 12:00:46 +0800 Subject: [PATCH 1/5] Add openeuler/httpd docker image --- httpd/2.4.51/22.03-lts/Dockerfile | 11 +++++++++ httpd/2.4.51/22.03-lts/httpd-foreground | 7 ++++++ httpd/README.md | 32 +++++++++++++++++++++++++ httpd/meta.yml | 3 +++ 4 files changed, 53 insertions(+) create mode 100644 httpd/2.4.51/22.03-lts/Dockerfile create mode 100755 httpd/2.4.51/22.03-lts/httpd-foreground create mode 100644 httpd/README.md create mode 100644 httpd/meta.yml diff --git a/httpd/2.4.51/22.03-lts/Dockerfile b/httpd/2.4.51/22.03-lts/Dockerfile new file mode 100644 index 00000000..63a92ff3 --- /dev/null +++ b/httpd/2.4.51/22.03-lts/Dockerfile @@ -0,0 +1,11 @@ +FROM openeuler/openeuler:22.03-lts +WORKDIR /etc/httpd +RUN yum -y update \ + && yum -y install httpd \ + && yum clean all \ + && httpd -v + +STOPSIGNAL SIGWINCH +COPY httpd-foreground /usr/local/bin +EXPOSE 80 +CMD ["httpd-foreground"] diff --git a/httpd/2.4.51/22.03-lts/httpd-foreground b/httpd/2.4.51/22.03-lts/httpd-foreground new file mode 100755 index 00000000..f50a3c74 --- /dev/null +++ b/httpd/2.4.51/22.03-lts/httpd-foreground @@ -0,0 +1,7 @@ +#!/bin/sh +set -e + +#Apache gets grumpy about PID files pre-existing +rm -f /etc/httpd/logs/httpd.pid + +exec httpd -DFOREGROUND "$@" diff --git a/httpd/README.md b/httpd/README.md new file mode 100644 index 00000000..c396dd5e --- /dev/null +++ b/httpd/README.md @@ -0,0 +1,32 @@ +#httpd + + +# Quick reference + +- The official redis docker image. + +- Maintained by: [openEuler CloudNative SIG](https://gitee.com/openeuler/cloudnative) + +- Where to get help: [openEuler CloudNative SIG](https://gitee.com/openeuler/cloudnative), [openEuler](https://gitee.com/openeuler/community) + +# Build reference + +Build images and push: +```shell +docker buildx build -t "openeuler/httpd:$VERSION-22.03-lts" --platform linux/amd64,linux/arm64 . --push +``` + +We are using `buildx` in here to generate multi-arch images, see more in [Docker Buildx](https://docs.docker.com/buildx/working-with-buildx/) + +# How to use this image +## start a httpd instance +```shell +docker run --name my-httpd -d -p 80:80 openeuler/httpd:2.4.51-22.03-lts +``` + +# Supported tags and respective Dockerfile links + +- 2.4.51-22.03-lts: httpd v2.4.51, openEuler 22.03 LTS + +## Operating System +Linux/Unix, ARM64 or x86-64 architecture. diff --git a/httpd/meta.yml b/httpd/meta.yml new file mode 100644 index 00000000..4f07e134 --- /dev/null +++ b/httpd/meta.yml @@ -0,0 +1,3 @@ +name: httpd +tag: 2.4.51-22.03-lts +file: 2.4.51/22.03-lts/Dockerfile -- Gitee From 1f094088244c2b35ff67d94baabd19f6f6bb7813 Mon Sep 17 00:00:00 2001 From: xiezhh23 <1260163954@qq.com> Date: Wed, 27 Dec 2023 07:40:07 +0000 Subject: [PATCH 2/5] update httpd/README.md. Signed-off-by: xiezhh23 <1260163954@qq.com> --- httpd/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/httpd/README.md b/httpd/README.md index c396dd5e..cc6d77af 100644 --- a/httpd/README.md +++ b/httpd/README.md @@ -13,7 +13,7 @@ Build images and push: ```shell -docker buildx build -t "openeuler/httpd:$VERSION-22.03-lts" --platform linux/amd64,linux/arm64 . --push +docker buildx build -t "openeuler/httpd:httpd2.4.51-oe2203lts" --platform linux/amd64,linux/arm64 . --push ``` We are using `buildx` in here to generate multi-arch images, see more in [Docker Buildx](https://docs.docker.com/buildx/working-with-buildx/) @@ -26,7 +26,7 @@ docker run --name my-httpd -d -p 80:80 openeuler/httpd:2.4.51-22.03-lts # Supported tags and respective Dockerfile links -- 2.4.51-22.03-lts: httpd v2.4.51, openEuler 22.03 LTS +- httpd2.4.51-oe2203lts: httpd v2.4.51, openEuler 22.03 LTS ## Operating System Linux/Unix, ARM64 or x86-64 architecture. -- Gitee From f6897a2231b909e140a4b090f4ef7c7857dc1cd8 Mon Sep 17 00:00:00 2001 From: xiezhh23 <1260163954@qq.com> Date: Wed, 27 Dec 2023 07:40:51 +0000 Subject: [PATCH 3/5] update httpd/README.md. Signed-off-by: xiezhh23 <1260163954@qq.com> --- httpd/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httpd/README.md b/httpd/README.md index cc6d77af..d8f2e797 100644 --- a/httpd/README.md +++ b/httpd/README.md @@ -21,7 +21,7 @@ We are using `buildx` in here to generate multi-arch images, see more in [Docker # How to use this image ## start a httpd instance ```shell -docker run --name my-httpd -d -p 80:80 openeuler/httpd:2.4.51-22.03-lts +docker run --name my-httpd -d -p 80:80 openeuler/httpd:httpd2.4.51-oe2203lts ``` # Supported tags and respective Dockerfile links -- Gitee From d8703fba4ebdf444f29679d0cb9e97acaab39ad8 Mon Sep 17 00:00:00 2001 From: xiezhh23 <1260163954@qq.com> Date: Wed, 27 Dec 2023 07:44:48 +0000 Subject: [PATCH 4/5] update httpd/meta.yml. Signed-off-by: xiezhh23 <1260163954@qq.com> --- httpd/meta.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/httpd/meta.yml b/httpd/meta.yml index 4f07e134..c124a5b9 100644 --- a/httpd/meta.yml +++ b/httpd/meta.yml @@ -1,3 +1,2 @@ -name: httpd -tag: 2.4.51-22.03-lts -file: 2.4.51/22.03-lts/Dockerfile +- httpd2.4.51-oe2203lts + 2.4.51/22.03-lts/Dockerfile \ No newline at end of file -- Gitee From c524a32d08ad5767c45b02cdba20470fd339fc7f Mon Sep 17 00:00:00 2001 From: xiezhh23 <1260163954@qq.com> Date: Thu, 28 Dec 2023 15:07:56 +0800 Subject: [PATCH 5/5] update README.md --- httpd/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/httpd/README.md b/httpd/README.md index d8f2e797..470580e0 100644 --- a/httpd/README.md +++ b/httpd/README.md @@ -1,4 +1,4 @@ -#httpd +# httpd # Quick reference @@ -13,7 +13,7 @@ Build images and push: ```shell -docker buildx build -t "openeuler/httpd:httpd2.4.51-oe2203lts" --platform linux/amd64,linux/arm64 . --push +docker buildx build -t "openeuler/httpd:{TAG}" --platform linux/amd64,linux/arm64 . --push ``` We are using `buildx` in here to generate multi-arch images, see more in [Docker Buildx](https://docs.docker.com/buildx/working-with-buildx/) @@ -21,7 +21,7 @@ We are using `buildx` in here to generate multi-arch images, see more in [Docker # How to use this image ## start a httpd instance ```shell -docker run --name my-httpd -d -p 80:80 openeuler/httpd:httpd2.4.51-oe2203lts +docker run --name my-httpd -d -p 80:80 openeuler/httpd:{TAG} ``` # Supported tags and respective Dockerfile links -- Gitee