Merge pull request #24 from macbre/alpine-3.13

FROM alpine:3.13 AS base

Author: macbre

Dockerfile

@@ -60,7 +60,7 @@ ARG CONFIG="\
 		--add-module=/tmp/lua-nginx-module-${LUA_NGINX_MODULE_VERSION} \
 	"
 
-FROM alpine:3.12 AS base
+FROM alpine:3.13 AS base
 LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
 
 ARG NGINX_VERSION
@@ -122,7 +122,7 @@ RUN \
 
 RUN \
 	export LUAJIT_LIB=/usr/lib \
-	&& export LUAJIT_INC=/usr/include/luajit-2.1 \
+	&& export LUAJIT_INC=/usr/include/moonjit-2.2 \
 	&& echo "Compiling nginx $NGINX_VERSION with brotli $NGX_BROTLI_COMMIT and lua nginx module v$LUA_NGINX_MODULE_VERSION ..." \
 	&& cd /usr/src/nginx-$NGINX_VERSION \
 	&& ./configure $CONFIG --with-debug \
@@ -167,7 +167,7 @@ RUN \
 			| xargs -r apk info --installed \
 			| sort -u > /tmp/runDeps.txt
 
-FROM alpine:3.12
+FROM alpine:3.13
 ARG NGINX_VERSION
 ARG NGX_BROTLI_COMMIT
 ARG LUA_NGINX_MODULE_VERSION

readme.md

@@ -15,8 +15,8 @@ docker pull macbre/nginx-brotli:1.19.7
 ```
 $ docker run -it macbre/nginx-brotli nginx -V
 nginx version: nginx/1.19.7
-built by gcc 9.3.0 (Alpine 9.3.0) 
-built with OpenSSL 1.1.1j  16 Feb 2021 (running with OpenSSL 1.1.1i  8 Dec 2020)
+built by gcc 10.2.1 20201203 (Alpine 10.2.1_pre1) 
+built with OpenSSL 1.1.1j  16 Feb 2021
 TLS SNI support enabled
 configure arguments: --prefix=/etc/nginx --sbin-path=/usr/sbin/nginx --modules-path=/usr/lib/nginx/modules --conf-path=/etc/nginx/nginx.conf --error-log-path=/var/log/nginx/error.log --http-log-path=/var/log/nginx/access.log --pid-path=/var/run/nginx.pid --lock-path=/var/run/nginx.lock --http-client-body-temp-path=/var/cache/nginx/client_temp --http-proxy-temp-path=/var/cache/nginx/proxy_temp --http-fastcgi-temp-path=/var/cache/nginx/fastcgi_temp --http-uwsgi-temp-path=/var/cache/nginx/uwsgi_temp --http-scgi-temp-path=/var/cache/nginx/scgi_temp --user=nginx --group=nginx --with-http_ssl_module --with-http_realip_module --with-http_addition_module --with-http_sub_module --with-http_dav_module --with-http_flv_module --with-http_mp4_module --with-http_gunzip_module --with-http_gzip_static_module --with-http_random_index_module --with-http_secure_link_module --with-http_stub_status_module --with-http_auth_request_module --with-http_xslt_module=dynamic --with-http_image_filter_module=dynamic --with-http_geoip_module=dynamic --with-threads --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module --with-stream_realip_module --with-stream_geoip_module=dynamic --with-http_slice_module --with-mail --with-mail_ssl_module --with-compat --with-file-aio --with-http_v2_module --add-module=/usr/src/ngx_brotli --with-ld-opt=-Wl,-rpath,/usr/lib --add-module=/tmp/ngx_devel_kit-0.3.1 --add-module=/tmp/lua-nginx-module-0.10.14
 ```