disable jemalloc for boring-nginx (alpine doesn't support it in 3.9)

This commit is contained in:
hoellen 2019-02-01 09:06:59 +01:00
parent feab2f3a69
commit 634bafb496

View File

@ -36,7 +36,6 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
zlib \ zlib \
libgcc \ libgcc \
libstdc++ \ libstdc++ \
jemalloc \
su-exec \ su-exec \
libressl \ libressl \
bind-tools \ bind-tools \
@ -48,7 +47,6 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
automake \ automake \
autoconf \ autoconf \
git \ git \
jemalloc-dev \
tar \ tar \
libtool \ libtool \
pcre-dev \ pcre-dev \
@ -86,7 +84,7 @@ RUN NB_CORES=${BUILD_CORES-$(getconf _NPROCESSORS_CONF)} \
--prefix=/etc/nginx \ --prefix=/etc/nginx \
--sbin-path=/usr/sbin/nginx \ --sbin-path=/usr/sbin/nginx \
--with-cc-opt="-O3 -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -Wno-deprecated-declarations -I ../boringssl/.openssl/include/" \ --with-cc-opt="-O3 -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -Wno-deprecated-declarations -I ../boringssl/.openssl/include/" \
--with-ld-opt="-lrt -ljemalloc -Wl,-Bsymbolic-functions -Wl,-z,relro -L ../boringssl/.openssl/lib" \ --with-ld-opt="-lrt -Wl,-Bsymbolic-functions -Wl,-z,relro -L ../boringssl/.openssl/lib" \
--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 \
${NGINX_MODULES} \ ${NGINX_MODULES} \