From ebd0b96d7e0d49f60a83c6f63eff1c1183c52c8c Mon Sep 17 00:00:00 2001 From: openeuler_bot <673672685@qq.com> Date: Tue, 29 Oct 2024 00:35:29 +0000 Subject: [PATCH 1/4] 24.03-lts update httpd to 2.4.62 --- httpd/2.4.62/24.03-lts/Dockerfile | 43 +++++++++++++++++++++++++ httpd/2.4.62/24.03-lts/httpd-foreground | 7 ++++ httpd/meta.yml | 3 ++ 3 files changed, 53 insertions(+) create mode 100644 httpd/2.4.62/24.03-lts/Dockerfile create mode 100644 httpd/2.4.62/24.03-lts/httpd-foreground diff --git a/httpd/2.4.62/24.03-lts/Dockerfile b/httpd/2.4.62/24.03-lts/Dockerfile new file mode 100644 index 00000000..0990da2d --- /dev/null +++ b/httpd/2.4.62/24.03-lts/Dockerfile @@ -0,0 +1,43 @@ +ARG BASE=openeuler/openeuler:24.03-lts +FROM ${BASE} + +ARG VERSION=2.4.62 +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 +EXPOSE 80 +CMD ["httpd-foreground"] \ No newline at end of file diff --git a/httpd/2.4.62/24.03-lts/httpd-foreground b/httpd/2.4.62/24.03-lts/httpd-foreground new file mode 100644 index 00000000..b76f4b6c --- /dev/null +++ b/httpd/2.4.62/24.03-lts/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/httpd/meta.yml b/httpd/meta.yml index 5b77d050..d876dd49 100644 --- a/httpd/meta.yml +++ b/httpd/meta.yml @@ -2,3 +2,6 @@ path: 2.4.51/22.03-lts/Dockerfile 2.4.58-oe2203sp3: path: 2.4.58/22.03-lts-sp3/Dockerfile + +2.4.62-oe2403lts: + path: httpd/2.4.62/24.03-lts/Dockerfile \ No newline at end of file -- Gitee From bf392c001019db0cfb465d211527db6de1cf1641 Mon Sep 17 00:00:00 2001 From: openeuler_bot <673672685@qq.com> Date: Tue, 29 Oct 2024 00:35:54 +0000 Subject: [PATCH 2/4] 22.03-lts-sp3 update httpd to 2.4.62 --- httpd/2.4.62/22.03-lts-sp3/Dockerfile | 43 +++++++++++++++++++++ httpd/2.4.62/22.03-lts-sp3/httpd-foreground | 7 ++++ httpd/meta.yml | 4 +- 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 httpd/2.4.62/22.03-lts-sp3/Dockerfile create mode 100644 httpd/2.4.62/22.03-lts-sp3/httpd-foreground diff --git a/httpd/2.4.62/22.03-lts-sp3/Dockerfile b/httpd/2.4.62/22.03-lts-sp3/Dockerfile new file mode 100644 index 00000000..4cda7f14 --- /dev/null +++ b/httpd/2.4.62/22.03-lts-sp3/Dockerfile @@ -0,0 +1,43 @@ +ARG BASE=openeuler/openeuler:22.03-lts-sp3 +FROM ${BASE} + +ARG VERSION=2.4.62 +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 +EXPOSE 80 +CMD ["httpd-foreground"] \ No newline at end of file diff --git a/httpd/2.4.62/22.03-lts-sp3/httpd-foreground b/httpd/2.4.62/22.03-lts-sp3/httpd-foreground new file mode 100644 index 00000000..b76f4b6c --- /dev/null +++ b/httpd/2.4.62/22.03-lts-sp3/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/httpd/meta.yml b/httpd/meta.yml index d876dd49..23d68c18 100644 --- a/httpd/meta.yml +++ b/httpd/meta.yml @@ -4,4 +4,6 @@ path: 2.4.58/22.03-lts-sp3/Dockerfile 2.4.62-oe2403lts: - path: httpd/2.4.62/24.03-lts/Dockerfile \ No newline at end of file + path: httpd/2.4.62/24.03-lts/Dockerfile +2.4.62-oe2203sp3: + path: httpd/2.4.62/22.03-lts-sp3/Dockerfile \ No newline at end of file -- Gitee From b63e854f9aa29de23d2e2207e156c03cb7a69ca5 Mon Sep 17 00:00:00 2001 From: openeuler_bot <673672685@qq.com> Date: Tue, 29 Oct 2024 00:36:19 +0000 Subject: [PATCH 3/4] 22.03-lts-sp4 update httpd to 2.4.62 --- httpd/2.4.62/22.03-lts-sp4/Dockerfile | 43 +++++++++++++++++++++ httpd/2.4.62/22.03-lts-sp4/httpd-foreground | 7 ++++ httpd/meta.yml | 4 +- 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 httpd/2.4.62/22.03-lts-sp4/Dockerfile create mode 100644 httpd/2.4.62/22.03-lts-sp4/httpd-foreground diff --git a/httpd/2.4.62/22.03-lts-sp4/Dockerfile b/httpd/2.4.62/22.03-lts-sp4/Dockerfile new file mode 100644 index 00000000..2fae6e5d --- /dev/null +++ b/httpd/2.4.62/22.03-lts-sp4/Dockerfile @@ -0,0 +1,43 @@ +ARG BASE=openeuler/openeuler:22.03-lts-sp4 +FROM ${BASE} + +ARG VERSION=2.4.62 +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 +EXPOSE 80 +CMD ["httpd-foreground"] \ No newline at end of file diff --git a/httpd/2.4.62/22.03-lts-sp4/httpd-foreground b/httpd/2.4.62/22.03-lts-sp4/httpd-foreground new file mode 100644 index 00000000..b76f4b6c --- /dev/null +++ b/httpd/2.4.62/22.03-lts-sp4/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/httpd/meta.yml b/httpd/meta.yml index 23d68c18..7badc989 100644 --- a/httpd/meta.yml +++ b/httpd/meta.yml @@ -6,4 +6,6 @@ 2.4.62-oe2403lts: path: httpd/2.4.62/24.03-lts/Dockerfile 2.4.62-oe2203sp3: - path: httpd/2.4.62/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: httpd/2.4.62/22.03-lts-sp3/Dockerfile +2.4.62-oe2203sp4: + path: httpd/2.4.62/22.03-lts-sp4/Dockerfile \ No newline at end of file -- Gitee From e0a6195e18c907952fb505969ca6a45c81f03927 Mon Sep 17 00:00:00 2001 From: openeuler_bot <673672685@qq.com> Date: Tue, 29 Oct 2024 00:36:44 +0000 Subject: [PATCH 4/4] 22.03-lts-sp1 update httpd to 2.4.62 --- httpd/2.4.62/22.03-lts-sp1/Dockerfile | 43 +++++++++++++++++++++ httpd/2.4.62/22.03-lts-sp1/httpd-foreground | 7 ++++ httpd/meta.yml | 4 +- 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 httpd/2.4.62/22.03-lts-sp1/Dockerfile create mode 100644 httpd/2.4.62/22.03-lts-sp1/httpd-foreground diff --git a/httpd/2.4.62/22.03-lts-sp1/Dockerfile b/httpd/2.4.62/22.03-lts-sp1/Dockerfile new file mode 100644 index 00000000..0a692759 --- /dev/null +++ b/httpd/2.4.62/22.03-lts-sp1/Dockerfile @@ -0,0 +1,43 @@ +ARG BASE=openeuler/openeuler:22.03-lts-sp1 +FROM ${BASE} + +ARG VERSION=2.4.62 +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 +EXPOSE 80 +CMD ["httpd-foreground"] \ No newline at end of file diff --git a/httpd/2.4.62/22.03-lts-sp1/httpd-foreground b/httpd/2.4.62/22.03-lts-sp1/httpd-foreground new file mode 100644 index 00000000..b76f4b6c --- /dev/null +++ b/httpd/2.4.62/22.03-lts-sp1/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/httpd/meta.yml b/httpd/meta.yml index 7badc989..e912b646 100644 --- a/httpd/meta.yml +++ b/httpd/meta.yml @@ -8,4 +8,6 @@ 2.4.62-oe2203sp3: path: httpd/2.4.62/22.03-lts-sp3/Dockerfile 2.4.62-oe2203sp4: - path: httpd/2.4.62/22.03-lts-sp4/Dockerfile \ No newline at end of file + path: httpd/2.4.62/22.03-lts-sp4/Dockerfile +2.4.62-oe2203sp1: + path: httpd/2.4.62/22.03-lts-sp1/Dockerfile \ No newline at end of file -- Gitee