boring-nginx: remove TLS 1.3 patch (not updated), nginx 1.11.10

This commit is contained in:
Wonderfall
2017-02-15 17:42:39 +01:00
parent 72f7575f5d
commit db82d0ee39
2 changed files with 2 additions and 64 deletions

View File

@ -2,12 +2,10 @@ FROM alpine:edge
ENV UID=991 GID=991
ARG NGINX_VERSION=1.11.9
ARG NGINX_VERSION=1.11.10
ARG GPG_NGINX="B0F4 2533 73F8 F6F5 10D4 2178 520A 9993 A1C0 52F8"
ARG BUILD_CORES
COPY tls1.3.patch /tmp/tls1.3.patch
RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
&& NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
&& BUILD_DEPS=" \
@ -25,7 +23,7 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
gnupg \
cmake \
go" \
&& apk -U add \
&& apk -U upgrade && apk add \
${BUILD_DEPS} \
pcre \
zlib \
@ -43,7 +41,6 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
&& git clone https://boringssl.googlesource.com/boringssl --depth=1 \
&& cd /tmp/ngx_brotli && git submodule update --init \
&& cd /tmp/boringssl \
&& patch -p1 < /tmp/tls1.3.patch \
&& mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release .. \
&& make -j ${NB_CORES} && cd .. \
&& mkdir -p .openssl/lib/ && cd .openssl && ln -s ../include && cd .. \