tweaks required to get this to build... ruby now needs ruby to install ruby

[discourse_docker.git] / image / base / install-nginx

diff --git a/image/base/install-nginx b/image/base/install-nginx
index 5d8ad5b8b0a580591429b67f523835a89b054b68..6622e906f7479e280e0dbf47223e97364e945feb 100755 (executable)
--- a/image/base/install-nginx
+++ b/image/base/install-nginx
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-VERSION=1.11.3
+VERSION=1.15.0
 cd /tmp
 
 apt-get install -y autoconf
@@ -27,6 +27,8 @@ apt-get install -y nginx libpcre3 libpcre3-dev
 # we don't want to accidentally upgrade nginx and undo our work
 apt-mark hold nginx
 
+# now ngx_brotli has brotli as a submodule
+cd /tmp/ngx_brotli && git submodule update --init && cd /tmp/nginx-$VERSION
 
 # ignoring depracations with -Wno-deprecated-declarations while we wait for this https://github.com/google/ngx_brotli/issues/39#issuecomment-254093378
 ./configure --with-cc-opt='-g -O2 -fPIE -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wno-deprecated-declarations' --with-ld-opt='-Wl,-Bsymbolic-functions -fPIE -pie -Wl,-z,relro -Wl,-z,now' --prefix=/usr/share/nginx --conf-path=/etc/nginx/nginx.conf --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --lock-path=/var/lock/nginx.lock --pid-path=/run/nginx.pid --http-client-body-temp-path=/var/lib/nginx/body --http-fastcgi-temp-path=/var/lib/nginx/fastcgi --http-proxy-temp-path=/var/lib/nginx/proxy --http-scgi-temp-path=/var/lib/nginx/scgi --http-uwsgi-temp-path=/var/lib/nginx/uwsgi --with-debug --with-pcre-jit --with-ipv6 --with-http_ssl_module --with-http_stub_status_module --with-http_realip_module --with-http_auth_request_module --with-http_addition_module --with-http_dav_module --with-http_gunzip_module --with-http_gzip_static_module --with-http_v2_module --with-http_sub_module --with-stream --with-stream_ssl_module --with-mail --with-mail_ssl_module --with-threads --add-module=/tmp/ngx_brotli