diff --git a/Others/httpd/2.4.66/24.03-lts-sp2/Dockerfile b/Others/httpd/2.4.66/24.03-lts-sp2/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..684c2233c4826127df48b94b67b7a4d56ae61fc2 --- /dev/null +++ b/Others/httpd/2.4.66/24.03-lts-sp2/Dockerfile @@ -0,0 +1,44 @@ +ARG BASE=openeuler/openeuler:24.03-lts-sp2 +FROM ${BASE} + +ARG VERSION=2.4.66 +ENV HTTPD_PREFIX /usr/local/apache2 +WORKDIR ${HTTPD_PREFIX} + +RUN yum install -y autoconf make gcc apr apr-devel apr-util-devel pcre-devel && \ + curl -fSL --output httpd.tar.gz https://archive.apache.org/dist/httpd/httpd-${VERSION}.tar.gz && \ + mkdir -p /src/httpd && tar -zvxf httpd.tar.gz -C /src/httpd --strip-components=1 && \ + rm -f httpd.tar.gz && yum clean all + +RUN cd /src/httpd && \ + ./configure --prefix=/usr/local/apache2 && \ + make && \ + make install && \ + rm -rf /src/httpd + +RUN groupadd -r www-data && useradd -r --create-home -g www-data www-data && \ + mkdir -p /var/www/html && \ + mv -f $HTTPD_PREFIX/htdocs/index.html /var/www/html/ && \ + sed -ri \ + -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \ + -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \ + -e 's!^(\s*TransferLog)\s+\S+!\1 /proc/self/fd/1!g' \ + -e 's!^(\s*User)\s+daemon\s*$!\1 www-data!g' \ + -e 's!^(\s*Group)\s+daemon\s*$!\1 www-data!g' \ + "$HTTPD_PREFIX/conf/httpd.conf" \ + "$HTTPD_PREFIX/conf/extra/httpd-ssl.conf" && \ + sed -ri -e 's!^(\s*DocumentRoot)\s+\S+!\1 "/var/www/html"!g' \ + "$HTTPD_PREFIX/conf/httpd.conf" && \ + sed -i '/^DocumentRoot/a\ + \n \ + Options Indexes FollowSymLinks \n \ + AllowOverride none \n \ + Require all granted \n \ +' "$HTTPD_PREFIX/conf/httpd.conf" && \ + ln -s $HTTPD_PREFIX/bin/httpd /usr/bin/httpd + +STOPSIGNAL SIGWINCH +COPY httpd-foreground /usr/local/bin +RUN chmod +x /usr/local/bin/httpd-foreground +EXPOSE 80 +CMD ["httpd-foreground"] \ No newline at end of file diff --git a/Others/httpd/2.4.66/24.03-lts-sp2/httpd-foreground b/Others/httpd/2.4.66/24.03-lts-sp2/httpd-foreground new file mode 100644 index 0000000000000000000000000000000000000000..b76f4b6c0fb6a87e2fc938c566d913d37d87146f --- /dev/null +++ b/Others/httpd/2.4.66/24.03-lts-sp2/httpd-foreground @@ -0,0 +1,7 @@ +#!/bin/sh +set -e + +#Apache gets grumpy about PID files pre-existing +rm -f /usr/local/apache2/logs/httpd.pid + +exec httpd -DFOREGROUND "$@" diff --git a/Others/httpd/README.md b/Others/httpd/README.md index e31aa404630375197afcc6466060e92cc30ea686..99e27679732b01cdbdd5c67fb1d427cce7d1ee99 100644 --- a/Others/httpd/README.md +++ b/Others/httpd/README.md @@ -17,6 +17,7 @@ Learn more on [Httpd Website](https://httpd.apache.org/)⁠. The tag of each `httpd` docker image is consist of the version of `httpd` and the version of basic image. The details are as follows | Tag | Currently | Architectures | |----------|-------------|------------------| +|[2.4.66-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/httpd/2.4.66/24.03-lts-sp2/Dockerfile) | httpd 2.4.66 on openEuler 24.03-LTS-SP2 | amd64, arm64 | |[2.4.51-oe2203lts](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/httpd/2.4.51/22.03-lts/Dockerfile)| Apache HTTP Server 2.4.51 on openEuler 22.03-LTS | amd64, arm64 | |[2.4.58-oe2203sp3](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/httpd/2.4.58/22.03-lts-sp3/Dockerfile)| Apache HTTP Server 2.4.58 on openEuler 22.03-LTS-SP3 | amd64, arm64 | |[2.4.62-oe2203sp1](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/httpd/2.4.62/22.03-lts-sp1/Dockerfile)| Apache HTTP Server 2.4.62 on openEuler 22.03-LTS-SP1 | amd64, arm64 | diff --git a/Others/httpd/doc/image-info.yml b/Others/httpd/doc/image-info.yml index ff7bb308d2024c969cec288aff8c858592cc16f5..461d93f915887c42aba5df45f78a20dae7e13b6f 100644 --- a/Others/httpd/doc/image-info.yml +++ b/Others/httpd/doc/image-info.yml @@ -11,6 +11,7 @@ tags: | | Tag | Currently | Architectures | |----------|-------------|------------------| + |[2.4.66-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/httpd/2.4.66/24.03-lts-sp2/Dockerfile) | httpd 2.4.66 on openEuler 24.03-LTS-SP2 | amd64, arm64 | |[2.4.51-oe2203lts](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/httpd/2.4.51/22.03-lts/Dockerfile)| Apache HTTP Server 2.4.51 on openEuler 22.03-LTS | amd64, arm64 | |[2.4.58-oe2203sp3](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/httpd/2.4.58/22.03-lts-sp3/Dockerfile)| Apache HTTP Server 2.4.58 on openEuler 22.03-LTS-SP3 | amd64, arm64 | |[2.4.62-oe2203sp1](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/httpd/2.4.62/22.03-lts-sp1/Dockerfile)| Apache HTTP Server 2.4.62 on openEuler 22.03-LTS-SP1 | amd64, arm64 | diff --git a/Others/httpd/meta.yml b/Others/httpd/meta.yml index ba5dfd5241a31556b257a9c8f1137a057d26275a..0beac103109b30a1f4b01da2f6c9cefbfd327efa 100644 --- a/Others/httpd/meta.yml +++ b/Others/httpd/meta.yml @@ -11,4 +11,6 @@ 2.4.62-oe2403lts: path: 2.4.62/24.03-lts/Dockerfile 2.4.65-oe2403sp2: - path: 2.4.65/24.03-lts-sp2/Dockerfile \ No newline at end of file + path: 2.4.65/24.03-lts-sp2/Dockerfile +2.4.66-oe2403sp2: + path: 2.4.66/24.03-lts-sp2/Dockerfile \ No newline at end of file