From 32f04dc510dc2728267f88fcddae0a0308921731 Mon Sep 17 00:00:00 2001 From: Ricard Bejarano Date: Sun, 10 Mar 2019 23:58:55 +0100 Subject: [PATCH] removed brotli support (reason: the brotli compression format is not standard) --- glibc/Dockerfile | 6 ++---- musl/Dockerfile | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/glibc/Dockerfile b/glibc/Dockerfile index c6fad8b..4c14ca1 100644 --- a/glibc/Dockerfile +++ b/glibc/Dockerfile @@ -32,8 +32,7 @@ ARG NGINX_CONFIG="\ --with-http_v2_module \ --with-stream \ --with-stream_ssl_module \ - --with-threads \ - --add-module=/tmp/ngx_brotli" + --with-threads" 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 @@ -53,8 +52,7 @@ RUN if [ "$PCRE_CHECKSUM" != "$(sha256sum /tmp/pcre.tar.gz | awk '{print $1}')" WORKDIR /tmp/nginx RUN apt update && \ - apt install -y git gcc g++ make && \ - git clone --recurse-submodules https://github.com/google/ngx_brotli.git /tmp/ngx_brotli && \ + apt install -y gcc g++ make && \ ./configure $NGINX_CONFIG && \ make diff --git a/musl/Dockerfile b/musl/Dockerfile index 860b0cd..082983e 100644 --- a/musl/Dockerfile +++ b/musl/Dockerfile @@ -30,8 +30,7 @@ ARG NGINX_CONFIG="\ --with-http_v2_module \ --with-stream \ --with-stream_ssl_module \ - --with-threads \ - --add-module=/tmp/ngx_brotli" + --with-threads" 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 @@ -50,8 +49,7 @@ RUN if [ "$PCRE_CHECKSUM" != "$(sha256sum /tmp/pcre.tar.gz | awk '{print $1}')" mv /tmp/nginx-$NGINX_VERSION /tmp/nginx WORKDIR /tmp/nginx -RUN apk add git gcc g++ perl make linux-headers && \ - git clone --recurse-submodules https://github.com/google/ngx_brotli.git /tmp/ngx_brotli && \ +RUN apk add gcc g++ perl make linux-headers && \ ./configure $NGINX_CONFIG && \ make