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

Merge APR -dev libraries into APR install lines

This commit is contained in:
Tom Parker 2015-11-03 21:32:40 +00:00
parent 26ccf07d37
commit 5b81416f52
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
2.2/Dockerfile
View File

@ -15,6 +15,8 @@ RUN apt-get update \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
libapr1 \ libapr1 \
libaprutil1 \ libaprutil1 \
libapr1-dev \
libaprutil1-dev \
libpcre++0 \ libpcre++0 \
libssl1.0.0 \ libssl1.0.0 \
&& rm -r /var/lib/apt/lists/* && rm -r /var/lib/apt/lists/*
@ -25,7 +27,6 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B1B96F45DFBDCCF974019
ENV HTTPD_VERSION 2.2.31 ENV HTTPD_VERSION 2.2.31
ENV HTTPD_BZ2_URL https://www.apache.org/dist/httpd/httpd-$HTTPD_VERSION.tar.bz2 ENV HTTPD_BZ2_URL https://www.apache.org/dist/httpd/httpd-$HTTPD_VERSION.tar.bz2
# libapr/aprutil are needed for apxs, and libc6-dev is a dependency of those
RUN buildDeps=' \ RUN buildDeps=' \
ca-certificates \ ca-certificates \
curl \ curl \
@ -35,14 +36,9 @@ RUN buildDeps=' \
libssl-dev \ libssl-dev \
make \ make \
' \ ' \
keepBuildDeps=' \
libapr1-dev \
libaprutil1-dev \
libc6-dev \
' \
set -x \ set -x \
&& apt-get update \ && apt-get update \
&& apt-get install -y --no-install-recommends $buildDeps $keepBuildDeps \ && apt-get install -y --no-install-recommends $buildDeps \
&& rm -r /var/lib/apt/lists/* \ && rm -r /var/lib/apt/lists/* \
&& curl -SL "$HTTPD_BZ2_URL" -o httpd.tar.bz2 \ && curl -SL "$HTTPD_BZ2_URL" -o httpd.tar.bz2 \
&& curl -SL "$HTTPD_BZ2_URL.asc" -o httpd.tar.bz2.asc \ && curl -SL "$HTTPD_BZ2_URL.asc" -o httpd.tar.bz2.asc \

10
2.4/Dockerfile
View File

@ -15,6 +15,8 @@ RUN apt-get update \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
libapr1 \ libapr1 \
libaprutil1 \ libaprutil1 \
libapr1-dev \
libaprutil1-dev \
libpcre++0 \ libpcre++0 \
libssl1.0.0 \ libssl1.0.0 \
&& rm -r /var/lib/apt/lists/* && rm -r /var/lib/apt/lists/*
@ -25,7 +27,6 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys A93D62ECC3C8EA12DB220
ENV HTTPD_VERSION 2.4.17 ENV HTTPD_VERSION 2.4.17
ENV HTTPD_BZ2_URL https://www.apache.org/dist/httpd/httpd-$HTTPD_VERSION.tar.bz2 ENV HTTPD_BZ2_URL https://www.apache.org/dist/httpd/httpd-$HTTPD_VERSION.tar.bz2
# libapr/aprutil are needed for apxs, and libc6-dev is a dependency of those
RUN buildDeps=' \ RUN buildDeps=' \
ca-certificates \ ca-certificates \
curl \ curl \
@ -35,14 +36,9 @@ RUN buildDeps=' \
libssl-dev \ libssl-dev \
make \ make \
' \ ' \
keepBuildDeps=' \
libapr1-dev \
libaprutil1-dev \
libc6-dev \
' \
set -x \ set -x \
&& apt-get update \ && apt-get update \
&& apt-get install -y --no-install-recommends $buildDeps $keepBuildDeps \ && apt-get install -y --no-install-recommends $buildDeps \
&& rm -r /var/lib/apt/lists/* \ && rm -r /var/lib/apt/lists/* \
&& curl -SL "$HTTPD_BZ2_URL" -o httpd.tar.bz2 \ && curl -SL "$HTTPD_BZ2_URL" -o httpd.tar.bz2 \
&& curl -SL "$HTTPD_BZ2_URL.asc" -o httpd.tar.bz2.asc \ && curl -SL "$HTTPD_BZ2_URL.asc" -o httpd.tar.bz2.asc \