Merge pull request #29 from macbre/remove-lua

Remove Lua support

Author: macbre

.github/workflows/dockerimage.yml

@@ -42,15 +42,14 @@ jobs:
           -p 0.0.0.0:8888:80 \
           -v "$PWD/tests":/static:ro \
           -v "$PWD/tests/static.conf":/etc/nginx/conf.d/static.conf:ro \
-          -v "$PWD/tests/env.conf":/etc/nginx/main.d/env.conf:ro \
-          --env FOO=foo-test-value \
           --name test_nginx \
           -t ${{ github.repository }}
 
         sleep 2; docker ps
         curl -v --compressed 0.0.0.0:8888 2>&1 | tee /tmp/out
 
-        # assert response headers presense
-        grep 'X-Foo: foo-test-value' /tmp/out
+        grep --fixed-strings '< Server: nginx' /tmp/out
+        grep --fixed-strings '< Content-Encoding: br' /tmp/out
+        grep --fixed-strings '<p>It works!</p>' /tmp/out
 
         docker logs test_nginx

Dockerfile

@@ -3,13 +3,6 @@ ARG NGINX_VERSION=1.19.10
 # https://github.com/google/ngx_brotli
 ARG NGX_BROTLI_COMMIT=9aec15e2aa6feea2113119ba06460af70ab3ea62
 
-# https://github.com/vision5/ngx_devel_kit/releases
-# https://hub.docker.com/r/firesh/nginx-lua/dockerfile
-ARG NGX_DEVEL_KIT_VERSION=0.3.1
-
-# https://github.com/openresty/luajit2/releases
-ARG LUA_NGINX_MODULE_VERSION=0.10.14
-
 ARG CONFIG="\
 		--prefix=/etc/nginx \
 		--sbin-path=/usr/sbin/nginx \
@@ -55,9 +48,6 @@ ARG CONFIG="\
 		--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-${NGX_DEVEL_KIT_VERSION} \
-		--add-module=/tmp/lua-nginx-module-${LUA_NGINX_MODULE_VERSION} \
 	"
 
 FROM alpine:3.13 AS base
@@ -66,8 +56,6 @@ LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 ARG NGINX_VERSION
 ARG NGX_BROTLI_COMMIT
 ARG CONFIG
-ARG NGX_DEVEL_KIT_VERSION
-ARG LUA_NGINX_MODULE_VERSION
 
 RUN \
 	apk add --no-cache --virtual .build-deps \
@@ -83,8 +71,6 @@ RUN \
 		libxslt-dev \
 		gd-dev \
 		geoip-dev \
-		luajit \
-		luajit-dev \
 	&& apk add --no-cache --virtual .brotli-build-deps \
 		autoconf \
 		libtool \
@@ -96,14 +82,8 @@ RUN \
 COPY nginx.pub /tmp/nginx.pub
 
 RUN \
-	echo "Fetcing lua-nginx-module $LUA_NGINX_MODULE_VERSION and nginx devel kit $NGX_DEVEL_KIT_VERSION ..." \
-	&& curl -fSL https://github.com/simpl/ngx_devel_kit/archive/v${NGX_DEVEL_KIT_VERSION}.tar.gz -o /tmp/ndk.tar.gz \
-	&& tar -xvf /tmp/ndk.tar.gz -C /tmp \
-	&& curl -fSL https://github.com/openresty/lua-nginx-module/archive/v${LUA_NGINX_MODULE_VERSION}.tar.gz -o /tmp/lua-nginx.tar.gz \
-	&& tar -xvf /tmp/lua-nginx.tar.gz -C /tmp
-
-RUN \
-	mkdir -p /usr/src/ngx_brotli \
+	echo "Compiling nginx $NGINX_VERSION with brotli $NGX_BROTLI_COMMIT" \
+	&& mkdir -p /usr/src/ngx_brotli \
 	&& cd /usr/src/ngx_brotli \
 	&& git init \
 	&& git remote add origin https://github.com/google/ngx_brotli.git \
@@ -121,10 +101,7 @@ RUN \
 	&& tar -zxC /usr/src -f nginx.tar.gz
 
 RUN \
-	export LUAJIT_LIB=/usr/lib \
-	&& 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 \
+	cd /usr/src/nginx-$NGINX_VERSION \
 	&& ./configure $CONFIG --with-debug \
 	&& make -j$(getconf _NPROCESSORS_ONLN) \
 	&& mv objs/nginx objs/nginx-debug \
@@ -169,8 +146,6 @@ RUN \
 
 FROM alpine:3.13
 ARG NGINX_VERSION
-ARG NGX_BROTLI_COMMIT
-ARG LUA_NGINX_MODULE_VERSION
 
 COPY --from=base /tmp/runDeps.txt /tmp/runDeps.txt
 COPY --from=base /etc/nginx /etc/nginx
@@ -195,10 +170,6 @@ RUN \
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY ssl_common.conf /etc/nginx/conf.d/ssl_common.conf
 
-ENV NGINX_VERSION $NGINX_VERSION
-ENV NGX_BROTLI_COMMIT $NGX_BROTLI_COMMIT
-ENV LUA_NGINX_MODULE_VERSION $LUA_NGINX_MODULE_VERSION
-
 EXPOSE 80 443
 
 STOPSIGNAL SIGTERM

nginx.conf

@@ -26,6 +26,8 @@ http {
 
     keepalive_timeout  65;
 
+    server_tokens off; # disables emitting nginx version in error messages and in the “Server” response header field
+
     gzip  on;
     brotli on;
     brotli_static on;

readme.md

@@ -1,6 +1,6 @@
 ## What is this?
 
-Stable and up-to-date [nginx](https://nginx.org/en/CHANGES) with [Google's `brotli` compression](https://github.com/google/ngx_brotli), [Lua module](https://github.com/openresty/lua-nginx-module), and [Grade A+ SSL config](https://ssl-config.mozilla.org/)
+Stable and up-to-date [nginx](https://nginx.org/en/CHANGES) with [Google's `brotli` compression](https://github.com/google/ngx_brotli) and [Grade A+ SSL config](https://ssl-config.mozilla.org/)
 
 
 ## How to use this image
@@ -18,7 +18,7 @@ nginx version: nginx/1.19.10
 built by gcc 10.2.1 20201203 (Alpine 10.2.1_pre1) 
 built with OpenSSL 1.1.1k  25 Mar 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
+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
 ```
 
 ## SSL Grade A+ handling

tests/env.conf

@@ -9,10 +9,5 @@ server {
         brotli_static on;
 
         expires 1d;
-
-	# test lua module, see env.conf too
-	set_by_lua $foo_from_env 'return os.getenv("FOO")';
-
-	add_header X-Foo $foo_from_env;
     }
 }