mirror of
https://github.com/hoellen/dockerfiles.git
synced 2026-06-02 06:30:08 +00:00
several enhancements
This commit is contained in:
@@ -65,8 +65,8 @@ RUN echo "@commuedge http://nl.alpinelinux.org/alpine/edge/community" >> /etc/ap
|
|||||||
&& patch -p1 < /tmp/boring.patch \
|
&& patch -p1 < /tmp/boring.patch \
|
||||||
&& ./configure \
|
&& ./configure \
|
||||||
--prefix=/etc/nginx \
|
--prefix=/etc/nginx \
|
||||||
--sbin-path=/usr/local/sbin/nginx \
|
--sbin-path=/sbin/nginx \
|
||||||
--with-cc-opt="-g -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIE -fstack-protector-strong -Wformat -Werror=format-security -I ../boringssl/.openssl/include/" \
|
--with-cc-opt="-g -O3 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIE -fstack-protector-strong -Wformat -Werror=format-security -I ../boringssl/.openssl/include/" \
|
||||||
--with-ld-opt="-Wl,-Bsymbolic-functions -Wl,-z,relro -L ../boringssl/.openssl/lib" \
|
--with-ld-opt="-Wl,-Bsymbolic-functions -Wl,-z,relro -L ../boringssl/.openssl/lib" \
|
||||||
--with-http_ssl_module \
|
--with-http_ssl_module \
|
||||||
--with-http_v2_module \
|
--with-http_v2_module \
|
||||||
@@ -85,14 +85,11 @@ RUN echo "@commuedge http://nl.alpinelinux.org/alpine/edge/community" >> /etc/ap
|
|||||||
--without-http_memcached_module \
|
--without-http_memcached_module \
|
||||||
--without-http_empty_gif_module \
|
--without-http_empty_gif_module \
|
||||||
--without-http_browser_module \
|
--without-http_browser_module \
|
||||||
--http-proxy-temp-path=/tmp/proxy_temp \
|
|
||||||
--http-client-body-temp-path=/tmp/client_body_temp \
|
|
||||||
--http-fastcgi-temp-path=/tmp/fastcgi_temp \
|
|
||||||
--http-log-path=/var/log/nginx/access.log \
|
--http-log-path=/var/log/nginx/access.log \
|
||||||
--error-log-path=/var/log/nginx/error.log \
|
--error-log-path=/var/log/nginx/error.log \
|
||||||
--add-module=/tmp/ngx_brotli \
|
--add-module=/tmp/ngx_brotli \
|
||||||
&& make -j ${NB_CORES} && make install && make clean \
|
&& make -j ${NB_CORES} && make install && make clean \
|
||||||
&& strip -s /usr/local/sbin/nginx \
|
&& strip -s /sbin/nginx \
|
||||||
&& apk del ${BUILD_DEPS} \
|
&& apk del ${BUILD_DEPS} \
|
||||||
&& rm -rf /tmp/* /var/cache/apk/* /root/.gnupg
|
&& rm -rf /tmp/* /var/cache/apk/* /root/.gnupg
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
diff -ur nginx-1.11.0/src/event/ngx_event_openssl.c nginx-1.11.0-patched/src/event/ngx_event_openssl.c
|
diff -ur nginx-1.11.1/src/event/ngx_event_openssl.c nginx-1.11.1-patched/src/event/ngx_event_openssl.c
|
||||||
--- nginx-1.11.0/src/event/ngx_event_openssl.c 2016-05-24 16:54:42.000000000 +0100
|
--- nginx-1.11.1/src/event/ngx_event_openssl.c 2016-06-01 07:32:19.447914116 +0200
|
||||||
+++ nginx-1.11.0-patched/src/event/ngx_event_openssl.c 2016-05-26 18:12:03.114511014 +0100
|
+++ nginx-1.11.1-patched/src/event/ngx_event_openssl.c 2016-06-01 07:34:11.267362975 +0200
|
||||||
@@ -1994,13 +1994,17 @@
|
@@ -1994,13 +1994,17 @@
|
||||||
|
|
||||||
/* handshake failures */
|
/* handshake failures */
|
||||||
@@ -19,9 +19,9 @@ diff -ur nginx-1.11.0/src/event/ngx_event_openssl.c nginx-1.11.0-patched/src/eve
|
|||||||
|| n == SSL_R_NO_COMPRESSION_SPECIFIED /* 187 */
|
|| n == SSL_R_NO_COMPRESSION_SPECIFIED /* 187 */
|
||||||
|| n == SSL_R_NO_SHARED_CIPHER /* 193 */
|
|| n == SSL_R_NO_SHARED_CIPHER /* 193 */
|
||||||
|| n == SSL_R_RECORD_LENGTH_MISMATCH /* 213 */
|
|| n == SSL_R_RECORD_LENGTH_MISMATCH /* 213 */
|
||||||
diff -ur nginx-1.11.0/src/http/ngx_http_upstream.c nginx-1.11.0-patched/src/http/ngx_http_upstream.c
|
diff -ur nginx-1.11.1/src/http/ngx_http_upstream.c nginx-1.11.1-patched/src/http/ngx_http_upstream.c
|
||||||
--- nginx-1.11.0/src/http/ngx_http_upstream.c 2016-05-24 16:54:43.000000000 +0100
|
--- nginx-1.11.1/src/http/ngx_http_upstream.c 2016-06-01 07:32:25.935882743 +0200
|
||||||
+++ nginx-1.11.0-patched/src/http/ngx_http_upstream.c 2016-05-26 18:12:23.166741658 +0100
|
+++ nginx-1.11.1-patched/src/http/ngx_http_upstream.c 2016-06-01 07:34:57.047131542 +0200
|
||||||
@@ -1690,7 +1690,7 @@
|
@@ -1690,7 +1690,7 @@
|
||||||
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
|
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
|
||||||
"upstream SSL server name: \"%s\"", name.data);
|
"upstream SSL server name: \"%s\"", name.data);
|
||||||
|
|||||||
@@ -20,6 +20,10 @@ http {
|
|||||||
access_log /var/log/nginx/access.log combined;
|
access_log /var/log/nginx/access.log combined;
|
||||||
error_log /var/log/nginx/error.log crit;
|
error_log /var/log/nginx/error.log crit;
|
||||||
|
|
||||||
|
fastcgi_temp_path /tmp/fastcgi 1 2;
|
||||||
|
proxy_temp_path /tmp/proxy 1 2;
|
||||||
|
client_body_temp_path /tmp/client_body 1 2;
|
||||||
|
|
||||||
client_body_buffer_size 10K;
|
client_body_buffer_size 10K;
|
||||||
client_header_buffer_size 1k;
|
client_header_buffer_size 1k;
|
||||||
client_max_body_size 8m;
|
client_max_body_size 8m;
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user