diff --git a/images/nginx/Makefile b/images/nginx/Makefile index 9c2d35653..0adb3b6d1 100644 --- a/images/nginx/Makefile +++ b/images/nginx/Makefile @@ -18,7 +18,7 @@ SHELL=/bin/bash -o pipefail # 0.0.0 shouldn't clobber any released builds -TAG ?= 0.100 +TAG ?= 0.101 REGISTRY ?= quay.io/kubernetes-ingress-controller IMGNAME = nginx diff --git a/images/nginx/rootfs/Dockerfile b/images/nginx/rootfs/Dockerfile index 24a019726..c1ce95bc5 100644 --- a/images/nginx/rootfs/Dockerfile +++ b/images/nginx/rootfs/Dockerfile @@ -49,7 +49,6 @@ RUN apk add -U --no-cache \ nano \ tzdata \ && 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 \ && adduser -S -D -H -u 101 -h /usr/local/nginx \ -s /sbin/nologin -G www-data -g www-data www-data \ diff --git a/images/nginx/rootfs/build.sh b/images/nginx/rootfs/build.sh index 89165f66f..bd198ec53 100755 --- a/images/nginx/rootfs/build.sh +++ b/images/nginx/rootfs/build.sh @@ -590,6 +590,8 @@ make install cd "$BUILD_PATH" git clone https://github.com/microsoft/mimalloc cd mimalloc +git checkout v1.6.2 + mkdir -p out/release cd out/release cmake ../..