From 89a8e76d0eb00bd242a1440617030f2b265b9abb Mon Sep 17 00:00:00 2001 From: ammnt Date: Sun, 8 Sep 2024 17:31:34 +0300 Subject: [PATCH] changed: migration to GitHub and set specific branch for OpenSSL --- Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3d4574d..1ea4b9c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,3 @@ -ARG OPENSSL_BRANCH="openssl-3.3" - FROM docker.io/library/alpine:latest RUN NB_CORES="${BUILD_CORES-$(getconf _NPROCESSORS_CONF)}" \ && apk -U upgrade && apk add --no-cache \ @@ -28,7 +26,7 @@ RUN NB_CORES="${BUILD_CORES-$(getconf _NPROCESSORS_CONF)}" \ libxslt \ libxslt-dev \ tini \ -&& cd /tmp && git -v clone https://github.com/nginx/nginx.git \ +&& cd /tmp && git clone https://github.com/nginx/nginx \ && sed -i -e 's@"nginx/"@" "@g' /tmp/nginx/src/core/nginx.h \ && sed -i -e 's@"nginx version: "@" "@g' /tmp/nginx/src/core/nginx.c \ && sed -i -e 's@r->headers_out.server == NULL@0@g' /tmp/nginx/src/http/ngx_http_header_filter_module.c \ @@ -43,7 +41,7 @@ RUN NB_CORES="${BUILD_CORES-$(getconf _NPROCESSORS_CONF)}" \ && sed -i -e '1i pid /tmp/nginx.pid;\n' /tmp/nginx/conf/nginx.conf \ && sed -i -e 's/SSL_OP_CIPHER_SERVER_PREFERENCE);/SSL_OP_CIPHER_SERVER_PREFERENCE | SSL_OP_PRIORITIZE_CHACHA);/g' /tmp/nginx/src/event/ngx_event_openssl.c \ && addgroup --gid 101 -S nginx && adduser -S nginx -s /sbin/nologin -G nginx --uid 101 --no-create-home \ -&& git clone --depth 1 --single-branch -b $OPENSSL_BRANCH https://github.com/openssl/openssl.git && git clone https://github.com/nginx/njs.git \ +&& git clone --recursive --depth 1 --single-branch -b openssl-3.3 https://github.com/openssl/openssl && git clone https://github.com/nginx/njs \ && cd /tmp/njs && ./configure && make -j "${NB_CORES}" && make clean \ && mkdir /var/cache/nginx && cd /tmp/nginx && ./auto/configure \ --with-debug \