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

Update nginx alpine image to 3.12

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-12-30 16:53:52 -03:00
parent d0bc1eb915
commit 0cca8e83ce
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
images/nginx/rootfs/Dockerfile
View file

@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
FROM alpine:3.11 as builder FROM alpine:3.12 as builder
COPY . / COPY . /

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

@ -114,7 +114,8 @@ apk add \
bc \ bc \
unzip \ unzip \
dos2unix \ dos2unix \
yaml-cpp yaml-cpp \
coreutils
mkdir -p /etc/nginx mkdir -p /etc/nginx
@ -590,6 +591,9 @@ cd "$BUILD_PATH/lua-resty-redis-$LUA_RESTY_REDIS_VERSION"
make install make install
cd "$BUILD_PATH/lua-resty-ipmatcher-$LUA_RESTY_IPMATCHER_VERSION" cd "$BUILD_PATH/lua-resty-ipmatcher-$LUA_RESTY_IPMATCHER_VERSION"
# temporal fix for make install - remove line 22
sed -i '22d' Makefile
make install make install
cd "$BUILD_PATH/lua-resty-global-throttle-$LUA_RESTY_GLOBAL_THROTTLE_VERSION" cd "$BUILD_PATH/lua-resty-global-throttle-$LUA_RESTY_GLOBAL_THROTTLE_VERSION"