DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pin mimalloc version and update openssl

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-04-21 20:28:06 -04:00
parent 2a7c19ca8b
commit 5d67794f4f
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
images/nginx/Makefile
View file

@ -18,7 +18,7 @@
SHELL=/bin/bash -o pipefail SHELL=/bin/bash -o pipefail
# 0.0.0 shouldn't clobber any released builds # 0.0.0 shouldn't clobber any released builds
TAG ?= 0.100 TAG ?= 0.101
REGISTRY ?= quay.io/kubernetes-ingress-controller REGISTRY ?= quay.io/kubernetes-ingress-controller
IMGNAME = nginx IMGNAME = nginx

1
images/nginx/rootfs/Dockerfile
View file

@ -49,7 +49,6 @@ RUN apk add -U --no-cache \
nano \ nano \
tzdata \ tzdata \
&& ln -s /usr/local/nginx/sbin/nginx /sbin/nginx \ && ln -s /usr/local/nginx/sbin/nginx /sbin/nginx \
&& ln -s /usr/local/lib/mimalloc-*/libmimalloc.so /usr/local/lib/libmimalloc.so \
&& addgroup -Sg 101 www-data \ && addgroup -Sg 101 www-data \
&& adduser -S -D -H -u 101 -h /usr/local/nginx \ && adduser -S -D -H -u 101 -h /usr/local/nginx \
-s /sbin/nologin -G www-data -g www-data www-data \ -s /sbin/nologin -G www-data -g www-data www-data \

2
images/nginx/rootfs/build.sh
View file

@ -590,6 +590,8 @@ make install
cd "$BUILD_PATH" cd "$BUILD_PATH"
git clone https://github.com/microsoft/mimalloc git clone https://github.com/microsoft/mimalloc
cd mimalloc cd mimalloc
git checkout v1.6.2
mkdir -p out/release mkdir -p out/release
cd out/release cd out/release
cmake ../.. cmake ../..