SLT-1039: Add support for nginx 1.26

.github/dependabot.yml

@@ -100,6 +100,15 @@ updates:
         update-types:
           - "version-update:semver-major"
           - "version-update:semver-minor"
+  - package-ecosystem: "docker"
+    directory: "/silta-nginx/1.26"
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "nginx"
+        update-types:
+          - "version-update:semver-major"
+          - "version-update:semver-minor"
 
   # silta-node
   - package-ecosystem: "docker"

silta-nginx/1.26/Dockerfile

@@ -0,0 +1,82 @@
+# https://hg.nginx.org/pkg-oss/tags
+ARG NGINX_VERSION=1.26.0
+
+FROM nginx:${NGINX_VERSION}-alpine as builder
+
+# https://github.com/openresty/echo-nginx-module/tags
+ENV HTTPECHO_VERSION=0.63
+
+# Nginx virtual host traffic status module
+# https://github.com/vozlt/nginx-module-vts
+ENV NGINX_VTS_VERSION 0.2.2
+
+RUN apk add --update gcc libc-dev linux-headers zlib-dev openrc autoconf automake g++ make \
+    libressl-dev geoip-dev lmdb-dev pcre-dev libtool libxml2-dev yajl-dev pkgconf zlib-dev \
+	libcurl curl tzdata
+
+# Download sources
+RUN curl "http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz" -o nginx.tar.gz && \
+  curl -L "https://github.com/openresty/echo-nginx-module/archive/v${HTTPECHO_VERSION}.tar.gz" -o httpecho.tar.gz && \
+  curl -L "https://github.com/vozlt/nginx-module-vts/archive/refs/tags/v${NGINX_VTS_VERSION}.tar.gz" -o nginx-module-vts.tar.gz
+
+# Reuse same cli arguments as the nginx:alpine image used to build
+RUN CONFARGS=$(nginx -V 2>&1 | sed -n -e 's/^.*arguments: //p') \
+    # 1.26.0 does not compile with the options that are removed below.
+    # It will generate errors like this: ./configure: error: invalid option "-fstack-clash-protection" \
+    # When 1.26.1 is used, this can be removed. Currently blocked by signalsciences module not supporting 1.26.1.
+    CONFARGS=${CONFARGS/-Os -fstack-clash-protection -Wformat -Werror=format-security -fno-plt -g/-Os} && \
+    CONFARGS=${CONFARGS/,--sort-common -Wl,-z,pack-relative-relocs/-Os} && \
+    mkdir /usr/src && \
+	tar -zxC /usr/src -f nginx.tar.gz && \
+  	# Uncompress echo module
+	tar -xzvf "httpecho.tar.gz" && \
+  	HTTPECHODIR="$(pwd)/echo-nginx-module-${HTTPECHO_VERSION}" && \
+  	# Uncompress vts module
+	tar -xzvf "nginx-module-vts.tar.gz" && \
+  	VTSDIR="$(pwd)/nginx-module-vts-${NGINX_VTS_VERSION}" && \
+  	cd /usr/src/nginx-$NGINX_VERSION && \
+  	./configure --with-compat $CONFARGS \
+		--add-dynamic-module=$HTTPECHODIR  \
+		--add-dynamic-module=$VTSDIR \
+		--with-http_stub_status_module && \
+  	make modules && \
+	# Move module to root so it's easier to locate it in the next layer
+  	mv ./objs/*.so /
+
+#### Make the nginx image and copy modules from builder
+
+FROM nginxinc/nginx-unprivileged:${NGINX_VERSION}-alpine
+ARG UID=101
+LABEL maintainer="wunder.io"
+USER root
+
+COPY --from=builder /ngx_http_echo_module.so /etc/nginx/modules/ngx_http_echo_module.so
+COPY modules/ngx_http_echo.conf /etc/nginx/modules/ngx_http_echo.conf
+
+# Nginx virtual host traffic status module
+COPY --from=builder /ngx_http_vhost_traffic_status_module.so /etc/nginx/modules/ngx_http_vhost_traffic_status_module.so
+
+# Fastly signal sciences module
+# https://docs.fastly.com/signalsciences/install-guides/nginx-module/alpine-nginx-1.15.3higher/
+RUN apk update && apk add wget openssl --virtual build-dependencies && \
+	wget https://apk.signalsciences.net/sigsci_apk.pub ; mv sigsci_apk.pub /etc/apk/keys && \
+	echo https://apk.signalsciences.net/3.19/main | tee -a /etc/apk/repositories && \
+	apk update && \
+	openssl rsa -pubin -in /etc/apk/keys/sigsci_apk.pub -text -noout && \
+	apk add nginx-module-sigsci-nxo-${NGINX_VERSION} && \
+	apk del build-dependencies
+# Module is enabled conditionally via chart template / configmap
+
+RUN rm -rf /etc/nginx/conf.d/default.conf \
+		&& touch /var/run/nginx.pid \
+		&& chown -R $UID:0 /var/run/nginx.pid
+
+RUN mkdir -p /var/www/html/web \
+      && ln -s /var/www/html /app
+RUN adduser nginx www-data
+
+STOPSIGNAL SIGQUIT
+
+USER $UID
+
+CMD ["nginx", "-g", "daemon off;"]

silta-nginx/1.26/TAGS

@@ -0,0 +1,3 @@
+1.26-v1
+1.26-v1.0
+1.26-v1.0.0

silta-nginx/1.26/modules/ngx_http_echo.conf

@@ -0,0 +1 @@
+load_module "modules/ngx_http_echo_module.so";