Fijxu/nginx-ktls
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

removed brotli support (reason: the brotli compression format is not standard)

Browse source
This commit is contained in:
Ricard Bejarano 2019-03-10 23:58:55 +01:00
parent b7d8616a14
commit 32f04dc510
No known key found for this signature in database
GPG key ID: 5A5105DD6B91CA19
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
glibc/Dockerfile
View file

@ -32,8 +32,7 @@ ARG NGINX_CONFIG="\
--with-http_v2_module \ --with-http_v2_module \
--with-stream \ --with-stream \
--with-stream_ssl_module \ --with-stream_ssl_module \
--with-threads \ --with-threads"
--add-module=/tmp/ngx_brotli"
ADD https://ftp.pcre.org/pub/pcre/pcre-$PCRE_VERSION.tar.gz /tmp/pcre.tar.gz ADD https://ftp.pcre.org/pub/pcre/pcre-$PCRE_VERSION.tar.gz /tmp/pcre.tar.gz
ADD https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz /tmp/openssl.tar.gz ADD https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz /tmp/openssl.tar.gz
@ -53,8 +52,7 @@ RUN if [ "$PCRE_CHECKSUM" != "$(sha256sum /tmp/pcre.tar.gz | awk '{print $1}')"
WORKDIR /tmp/nginx WORKDIR /tmp/nginx
RUN apt update && \ RUN apt update && \
apt install -y git gcc g++ make && \ apt install -y gcc g++ make && \
git clone --recurse-submodules https://github.com/google/ngx_brotli.git /tmp/ngx_brotli && \
./configure $NGINX_CONFIG && \ ./configure $NGINX_CONFIG && \
make make

6
musl/Dockerfile
View file

@ -30,8 +30,7 @@ ARG NGINX_CONFIG="\
--with-http_v2_module \ --with-http_v2_module \
--with-stream \ --with-stream \
--with-stream_ssl_module \ --with-stream_ssl_module \
--with-threads \ --with-threads"
--add-module=/tmp/ngx_brotli"
ADD https://ftp.pcre.org/pub/pcre/pcre-$PCRE_VERSION.tar.gz /tmp/pcre.tar.gz ADD https://ftp.pcre.org/pub/pcre/pcre-$PCRE_VERSION.tar.gz /tmp/pcre.tar.gz
ADD https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz /tmp/openssl.tar.gz ADD https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz /tmp/openssl.tar.gz
@ -50,8 +49,7 @@ RUN if [ "$PCRE_CHECKSUM" != "$(sha256sum /tmp/pcre.tar.gz | awk '{print $1}')"
mv /tmp/nginx-$NGINX_VERSION /tmp/nginx mv /tmp/nginx-$NGINX_VERSION /tmp/nginx
WORKDIR /tmp/nginx WORKDIR /tmp/nginx
RUN apk add git gcc g++ perl make linux-headers && \ RUN apk add gcc g++ perl make linux-headers && \
git clone --recurse-submodules https://github.com/google/ngx_brotli.git /tmp/ngx_brotli && \
./configure $NGINX_CONFIG && \ ./configure $NGINX_CONFIG && \
make make