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

Add a few more minor tweaks (especially for closer Alpine vs Debian parity)

This commit is contained in:
Tianon Gravi 2018-10-19 14:15:59 -07:00
parent 0fc311b978
commit c1891301f0
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
2.4/Dockerfile
View File

@ -11,19 +11,14 @@ WORKDIR $HTTPD_PREFIX
# install httpd runtime dependencies # install httpd runtime dependencies
# https://httpd.apache.org/docs/2.4/install.html#requirements # https://httpd.apache.org/docs/2.4/install.html#requirements
RUN apt-get update \ RUN set -eux; \
&& apt-get install -y --no-install-recommends \ apt-get update; \
libapr1 \ apt-get install -y --no-install-recommends \
libaprutil1 \
libaprutil1-ldap \
libapr1-dev \ libapr1-dev \
libaprutil1-dev \ libaprutil1-dev \
liblua5.2-0 \ libaprutil1-ldap \
libnghttp2-14 \ ; \
libpcre++0v5 \ rm -rf /var/lib/apt/lists/*
libssl1.1 \
libxml2 \
&& rm -r /var/lib/apt/lists/*
ENV HTTPD_VERSION 2.4.35 ENV HTTPD_VERSION 2.4.35
ENV HTTPD_SHA256 2607c6fdd4d12ac3f583127629291e9432b247b782396a563bec5678aae69b56 ENV HTTPD_SHA256 2607c6fdd4d12ac3f583127629291e9432b247b782396a563bec5678aae69b56
@ -55,12 +50,12 @@ RUN set -eux; \
gnupg \ gnupg \
liblua5.2-dev \ liblua5.2-dev \
libnghttp2-dev \ libnghttp2-dev \
libpcre++-dev \ libpcre3-dev \
libssl-dev \ libssl-dev \
libxml2-dev \ libxml2-dev \
zlib1g-dev \
make \ make \
wget \ wget \
zlib1g-dev \
; \ ; \
rm -r /var/lib/apt/lists/*; \ rm -r /var/lib/apt/lists/*; \
\ \
@ -142,7 +137,10 @@ RUN set -eux; \
| sort -u \ | sort -u \
| xargs -r apt-mark manual \ | xargs -r apt-mark manual \
; \ ; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
\
# smoke test
httpd -v
COPY httpd-foreground /usr/local/bin/ COPY httpd-foreground /usr/local/bin/

5
2.4/alpine/Dockerfile
View File

@ -136,7 +136,10 @@ RUN set -eux; \
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \ | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
)"; \ )"; \
apk add --virtual .httpd-rundeps $runDeps; \ apk add --virtual .httpd-rundeps $runDeps; \
apk del .build-deps apk del .build-deps; \
\
# smoke test
httpd -v
COPY httpd-foreground /usr/local/bin/ COPY httpd-foreground /usr/local/bin/