From 0cca8e83ceb90c569aaa2419d0a29d8cae551e7c Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Wed, 30 Dec 2020 16:53:52 -0300 Subject: [PATCH] Update nginx alpine image to 3.12 --- images/nginx/rootfs/Dockerfile | 2 +- images/nginx/rootfs/build.sh | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/images/nginx/rootfs/Dockerfile b/images/nginx/rootfs/Dockerfile index a8cbd2a66..67d639ee2 100644 --- a/images/nginx/rootfs/Dockerfile +++ b/images/nginx/rootfs/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. -FROM alpine:3.11 as builder +FROM alpine:3.12 as builder COPY . / diff --git a/images/nginx/rootfs/build.sh b/images/nginx/rootfs/build.sh index ae37ee129..c757f8b20 100755 --- a/images/nginx/rootfs/build.sh +++ b/images/nginx/rootfs/build.sh @@ -114,7 +114,8 @@ apk add \ bc \ unzip \ dos2unix \ - yaml-cpp + yaml-cpp \ + coreutils mkdir -p /etc/nginx @@ -590,6 +591,9 @@ cd "$BUILD_PATH/lua-resty-redis-$LUA_RESTY_REDIS_VERSION" make install cd "$BUILD_PATH/lua-resty-ipmatcher-$LUA_RESTY_IPMATCHER_VERSION" +# temporal fix for make install - remove line 22 +sed -i '22d' Makefile + make install cd "$BUILD_PATH/lua-resty-global-throttle-$LUA_RESTY_GLOBAL_THROTTLE_VERSION"