switched nginx from boringssl to libressl

2025-04-16 20:28:41 +08:00
parent 90d382be33
commit eea1e08273
6 changed files with 246 additions and 200 deletions
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -1,180 +1,101 @@
-FROM alpine:latest
+
+FROM alpine:latest AS base
+
+FROM alpine:latest AS build
+ARG NGINX_VERSION LIBRESSL_VERSION=4.0.0
+ENV NGINX_VERSION=${NGINX_VERSION}
+RUN --mount=type=cache,target=/var/cache/apk apk add \
+	autoconf \
+	automake \
+	bind-tools \
+	binutils \
+	build-base \
+	ca-certificates \
+	cmake \
+	curl \
+	gcc \
+	gd-dev \
+	geoip-dev \
+	git \
+	gnupg \
+	go \
+	libc-dev \
+	libgcc \
+	libstdc++ \
+	libtool \
+	libxslt-dev \
+	linux-headers \
+	make \
+	ninja \
+	pcre \
+	pcre-dev \
+	perl-dev \
+	su-exec \
+	tar \
+	tzdata \
+	zlib \
+	zlib-dev \
+	mercurial
+RUN adduser -D luser
+USER luser
+WORKDIR /home/luser
+# ADD --chown=luser:luser https://boringssl.googlesource.com/boringssl.git boringssl
+# RUN grep -qxF 'SET_TARGET_PROPERTIES(crypto PROPERTIES SOVERSION 1)' boringssl/crypto/CMakeLists.txt || echo -e '\nSET_TARGET_PROPERTIES(crypto PROPERTIES SOVERSION 1)' >> boringssl/crypto/CMakeLists.txt
+# RUN grep -qxF 'SET_TARGET_PROPERTIES(ssl PROPERTIES SOVERSION 1)' boringssl/ssl/CMakeLists.txt || echo -e '\nSET_TARGET_PROPERTIES(ssl PROPERTIES SOVERSION 1)' >> boringssl/ssl/CMakeLists.txt
+# RUN mkdir -p boringssl/build
+# RUN cmake -G Ninja -B boringssl/build -S boringssl -DCMAKE_BUILD_TYPE=Release
+# RUN cmake --build boringssl/build
+
+#RUN git clone --depth 1 --branch v4.0.0 https://github.com/libressl/portable.git libressl
+ADD --chown=luser:luser https://cdn.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${LIBRESSL_VERSION}.tar.gz libressl.tgz
+RUN tar -xzf libressl.tgz && mv libressl-${LIBRESSL_VERSION} libressl && rm libressl.tgz
+RUN mkdir -p libressl/build
+RUN cmake -G Ninja -B libressl/build -S libressl \ 
+	-DCMAKE_BUILD_TYPE=Release \
+	-DLIBRESSL_APPS=OFF \
+	-DLIBRESSL_SKIP_INSTALL=ON \
+	-DENABLE_ASM=OFF \
+	-DENABLE_NC=OFF \
+	-DLIBRESSL_TESTS=OFF \
+	-DBUILD_SHARED_LIBS=OFF
+RUN cmake --build libressl/build
+
+ADD --chown=luser:luser https://github.com/nginx/nginx.git#release-${NGINX_VERSION} /nginx
+ADD --chown=luser:luser https://github.com/openresty/headers-more-nginx-module.git /ngx_headers_more
+ADD --chown=luser:luser https://github.com/google/ngx_brotli.git /ngx_brotli
+USER root
+WORKDIR /
+RUN hg clone http://hg.nginx.org/njs /njs
+RUN chown luser:luser -R /njs
+USER luser
+WORKDIR /home/luser
+ADD --chown=luser:luser --chmod=755 ./build.sh ./build.sh
+RUN ./build.sh
+
+
+FROM base AS release
 ARG VERSION
 ENV NGINX_VERSION=${VERSION}
-RUN GPG_KEYS=D6786CE303D9A9022998DC6CC8464D549AF75C0A \
-	&& CONFIG="\
-		--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-http_perl_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 \
-		--with-http_v3_module \
-		--add-dynamic-module=/usr/src/ngx_headers_more \
-		--add-dynamic-module=/usr/src/ngx_brotli \
-		--add-dynamic-module=/usr/src/njs/nginx \
-	" \
-	&& addgroup -S nginx \
-	&& adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx \
-	&& apk add --no-cache --virtual .build-deps \
-		autoconf \
-		automake \
-		bind-tools \
-		binutils \
-		build-base \
-		ca-certificates \
-		cmake \
-		curl \
-		gcc \
-		gd-dev \
-		geoip-dev \
-		git \
-		gnupg \
-		go \
-		libc-dev \
-		libgcc \
-		libstdc++ \
-		libtool \
-		libxslt-dev \
-		linux-headers \
-		make \
-		pcre \
-		pcre-dev \
-		perl-dev \
-		su-exec \
-		tar \
-		tzdata \
-		zlib \
-		zlib-dev \
-		mercurial \
-	&& curl -fSL https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz -o nginx-${NGINX_VERSION}.tar.gz \
-	&& curl -fSL https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz.asc  -o nginx-${NGINX_VERSION}.tar.gz.asc \
-	&& export GNUPGHOME="$(mktemp -d)" \
-	&& found=''; \
-	for server in \
-		ha.pool.sks-keyservers.net \
-		hkp://keyserver.ubuntu.com:80 \
-		hkp://p80.pool.sks-keyservers.net:80 \
-		pgp.mit.edu \
-	; do \
-		echo "Fetching GPG key $GPG_KEYS from $server"; \
-		gpg --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$GPG_KEYS" && found=yes && break; \
-	done; \
-	test -z "$found" && echo >&2 "error: failed to fetch GPG key $GPG_KEYS" && exit 1; \
-	gpg --batch --verify nginx-${NGINX_VERSION}.tar.gz.asc nginx-${NGINX_VERSION}.tar.gz \
-	&& mkdir -p /usr/src \
-	&& tar -zxC /usr/src -f nginx-${NGINX_VERSION}.tar.gz \
-	&& rm nginx-${NGINX_VERSION}.tar.gz \
-	&& rm -rf "$GNUPGHOME" nginx-${NGINX_VERSION}.tar.gz.asc \
-	&& git clone --depth=1 --recurse-submodules https://github.com/google/ngx_brotli /usr/src/ngx_brotli \
-	&& git clone --depth=1 https://github.com/openresty/headers-more-nginx-module /usr/src/ngx_headers_more \
-	&& hg clone http://hg.nginx.org/njs /usr/src/njs \
-	&& (git clone https://boringssl.googlesource.com/boringssl /usr/src/boringssl \
-		&& cd /usr/src/boringssl && git checkout --force --quiet e648990 \
-		&& (grep -qxF 'SET_TARGET_PROPERTIES(crypto PROPERTIES SOVERSION 1)' /usr/src/boringssl/crypto/CMakeLists.txt || echo -e '\nSET_TARGET_PROPERTIES(crypto PROPERTIES SOVERSION 1)' >> /usr/src/boringssl/crypto/CMakeLists.txt) \
-		&& (grep -qxF 'SET_TARGET_PROPERTIES(ssl PROPERTIES SOVERSION 1)' /usr/src/boringssl/ssl/CMakeLists.txt || echo -e '\nSET_TARGET_PROPERTIES(ssl PROPERTIES SOVERSION 1)' >> /usr/src/boringssl/ssl/CMakeLists.txt) \
-		&& mkdir -p /usr/src/boringssl/build \
-		&& cmake -B/usr/src/boringssl/build -S/usr/src/boringssl -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-		&& make -C/usr/src/boringssl/build -j$(getconf _NPROCESSORS_ONLN) \
-	   ) \
-	&& cd /usr/src/nginx-${NGINX_VERSION} \
-	&& curl -fSL https://raw.githubusercontent.com/nginx-modules/ngx_http_tls_dyn_size/master/nginx__dynamic_tls_records_1.27.2%2B.patch -o dynamic_tls_records.patch \
-	&& patch -p1 < dynamic_tls_records.patch \
-	&& ./configure $CONFIG --with-debug --with-cc-opt="-I/usr/src/boringssl/include" --with-ld-opt="-L/usr/src/boringssl/build/ssl -L/usr/src/boringssl/build/crypto" \
-	&& make -j$(getconf _NPROCESSORS_ONLN) \
-	&& mv objs/nginx objs/nginx-debug \
-	&& mv objs/ngx_http_xslt_filter_module.so objs/ngx_http_xslt_filter_module-debug.so \
-	&& mv objs/ngx_http_image_filter_module.so objs/ngx_http_image_filter_module-debug.so \
-	&& mv objs/ngx_http_geoip_module.so objs/ngx_http_geoip_module-debug.so \
-	&& mv objs/ngx_http_perl_module.so objs/ngx_http_perl_module-debug.so \
-	&& mv objs/ngx_stream_geoip_module.so objs/ngx_stream_geoip_module-debug.so \
-	&& ./configure $CONFIG --with-cc-opt="-I/usr/src/boringssl/include" --with-ld-opt="-L/usr/src/boringssl/build/ssl -L/usr/src/boringssl/build/crypto" \
-	&& make -j$(getconf _NPROCESSORS_ONLN) \
-	&& make install \
-	&& rm -rf /etc/nginx/html/ \
-	&& mkdir /etc/nginx/conf.d/ \
-	&& mkdir -p /usr/share/nginx/html/ \
-	&& install -m644 html/index.html /usr/share/nginx/html/ \
-	&& install -m644 html/50x.html /usr/share/nginx/html/ \
-	&& install -m755 objs/nginx-debug /usr/sbin/nginx-debug \
-	&& install -m755 objs/ngx_http_xslt_filter_module-debug.so /usr/lib/nginx/modules/ngx_http_xslt_filter_module-debug.so \
-	&& install -m755 objs/ngx_http_image_filter_module-debug.so /usr/lib/nginx/modules/ngx_http_image_filter_module-debug.so \
-	&& install -m755 objs/ngx_http_geoip_module-debug.so /usr/lib/nginx/modules/ngx_http_geoip_module-debug.so \
-	&& install -m755 objs/ngx_http_perl_module-debug.so /usr/lib/nginx/modules/ngx_http_perl_module-debug.so \
-	&& install -m755 objs/ngx_stream_geoip_module-debug.so /usr/lib/nginx/modules/ngx_stream_geoip_module-debug.so \
-	&& ln -s ../../usr/lib/nginx/modules /etc/nginx/modules \
-	&& strip /usr/sbin/nginx* \
-	&& strip /usr/lib/nginx/modules/*.so \
-	&& rm -rf /usr/src/nginx-${NGINX_VERSION} \
-	&& rm -rf /usr/src/boringssl /usr/src/ngx_* /usr/src/njs \
-	\
-	# Bring in gettext so we can get `envsubst`, then throw
-	# the rest away. To do this, we need to install `gettext`
-	# then move `envsubst` out of the way so `gettext` can
-	# be deleted completely, then move `envsubst` back.
-	&& apk add --no-cache --virtual .gettext gettext \
-	&& mv /usr/bin/envsubst /tmp/ \
-	\
-	&& runDeps="$( \
-		scanelf --needed --nobanner /usr/sbin/nginx /usr/lib/nginx/modules/*.so /tmp/envsubst \
-			| awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \
-			| sort -u \
-			| xargs -r apk info --installed \
-			| sort -u \
-	) tzdata ca-certificates" \
-	&& apk add --no-cache --virtual .nginx-rundeps $runDeps \
-	&& apk del .build-deps \
-	&& apk del .gettext \
-	&& mv /tmp/envsubst /usr/local/bin/ \
-	\
-	# forward request and error logs to docker log collector
-	&& ln -sf /dev/stdout /var/log/nginx/access.log \
-	&& ln -sf /dev/stderr /var/log/nginx/error.log
+
+RUN addgroup -S nginx
+RUN adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx
+
+RUN --mount=type=cache,target=/var/cache/apk apk add --virtual .install_deps make perl-dev gettext binutils
+RUN --mount=type=cache,target=/var/cache/apk \
+    --mount=type=bind,from=build,source=/nginx,target=/nginx \
+    --mount=type=bind,from=build,source=/ngx_headers_more,target=/ngx_headers_more \
+    --mount=type=bind,from=build,source=/ngx_brotli,target=/ngx_brotli \
+    --mount=type=bind,from=build,source=/njs,target=/njs \
+	--mount=type=bind,source=install.sh,target=/install.sh \
+	 (cd nginx && sh /install.sh)
+RUN --mount=type=cache,target=/var/cache/apk apk del .install_deps

 COPY conf/nginx.conf /etc/nginx/nginx.conf
 COPY conf/nginx.vh.no-default.conf /etc/nginx/conf.d/default.conf

-LABEL description="NGINX Docker built top of rolling release BoringSSL" \
-      maintainer="Denis Denisov <denji0k@gmail.com>" \
-      openssl="BoringSSL" \
+LABEL description="NGINX Docker built top of LibreSSL" \
+      maintainer="Walter Oggioni <oggioni.walter@gmail.com>" \
+      openssl="LibreSSL" \
      nginx="nginx ${NGINX_VERSION}"

 EXPOSE 80 443 443/udp