docker-library
/
httpd
mirror of https://github.com/docker-library/httpd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #232 from infosiftr/patch 

Update list of patches to apply (and add "patch" for applying them)
This commit is contained in:
yosifkit 2023-05-10 15:20:34 -07:00 committed by GitHub
parent eee9da7ded ef41771bcc
commit b84fbb5161
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
2.4/Dockerfile
View File

@ -26,7 +26,7 @@ ENV HTTPD_VERSION 2.4.57
ENV HTTPD_SHA256 dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a ENV HTTPD_SHA256 dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a
# https://httpd.apache.org/security/vulnerabilities_24.html # https://httpd.apache.org/security/vulnerabilities_24.html
ENV HTTPD_PATCHES="" ENV HTTPD_PATCHES="rewrite-windows-testchar-h.patch 1d5620574fa03b483262dc5b9a66a6906553389952ab5d3070a02f887cc20193"
# see https://httpd.apache.org/docs/2.4/install.html#requirements # see https://httpd.apache.org/docs/2.4/install.html#requirements
RUN set -eux; \ RUN set -eux; \
@ -51,6 +51,7 @@ RUN set -eux; \
libssl-dev \ libssl-dev \
libxml2-dev \ libxml2-dev \
make \ make \
patch \
wget \ wget \
zlib1g-dev \ zlib1g-dev \
; \ ; \

3
2.4/alpine/Dockerfile
View File

@ -30,7 +30,7 @@ ENV HTTPD_VERSION 2.4.57
ENV HTTPD_SHA256 dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a ENV HTTPD_SHA256 dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a
# https://httpd.apache.org/security/vulnerabilities_24.html # https://httpd.apache.org/security/vulnerabilities_24.html
ENV HTTPD_PATCHES="" ENV HTTPD_PATCHES="rewrite-windows-testchar-h.patch 1d5620574fa03b483262dc5b9a66a6906553389952ab5d3070a02f887cc20193"
# see https://httpd.apache.org/docs/2.4/install.html#requirements # see https://httpd.apache.org/docs/2.4/install.html#requirements
RUN set -eux; \ RUN set -eux; \
@ -43,6 +43,7 @@ RUN set -eux; \
gcc \ gcc \
gnupg \ gnupg \
libc-dev \ libc-dev \
patch \
# mod_md # mod_md
curl-dev \ curl-dev \
jansson-dev \ jansson-dev \