From d57fddebd79d638fe1a2879582373d4b59a9d8cf Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Tue, 25 Jun 2019 06:58:27 -0400 Subject: [PATCH] Update image dependencies (#4225) --- images/nginx/Makefile | 2 +- images/nginx/README.md | 11 ++++------- images/nginx/rc.yaml | 2 +- images/nginx/rootfs/build.sh | 10 +++++++++- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/images/nginx/Makefile b/images/nginx/Makefile index 079e6c069c..1e3aed385a 100644 --- a/images/nginx/Makefile +++ b/images/nginx/Makefile @@ -13,7 +13,7 @@ # limitations under the License. # 0.0.0 shouldn't clobber any released builds -TAG ?= 0.88 +TAG ?= 0.89 REGISTRY ?= quay.io/kubernetes-ingress-controller ARCH ?= $(shell go env GOARCH) DOCKER ?= docker diff --git a/images/nginx/README.md b/images/nginx/README.md index ac536aec43..2485a637dc 100644 --- a/images/nginx/README.md +++ b/images/nginx/README.md @@ -1,12 +1,9 @@ -nginx 1.15.x base image using [debian-base](quay.io/kubernetes-ingress-controller/debian-base-amd64) +OpenResty base image using [debian-base](quay.io/kubernetes-ingress-controller/debian-base-amd64) -nginx [engine x] is an HTTP and reverse proxy server, a mail proxy server, and a generic TCP proxy server. +OpenResty® is a dynamic web platform based on NGINX and LuaJIT. -This custom nginx image contains: +This custom image contains: -- [ngx_devel_kit](https://github.com/simpl/ngx_devel_kit) -- [set-misc-nginx-module](https://github.com/openresty/set-misc-nginx-module) -- [headers-more-nginx-module](https://github.com/openresty/headers-more-nginx-module) - [nginx-http-auth-digest](https://github.com/atomx/nginx-http-auth-digest) - [ngx_http_substitutions_filter_module](https://github.com/yaoweibin/ngx_http_substitutions_filter_module) - [nginx-opentracing](https://github.com/opentracing-contrib/nginx-opentracing) @@ -23,7 +20,7 @@ This image provides a default configuration file with no backend servers. _Using docker_ ```console -docker run -v /some/nginx.con:/etc/nginx/nginx.conf:ro quay.io/kubernetes-ingress-controller/nginx:0.84 +docker run -v /some/nginx.con:/etc/nginx/nginx.conf:ro quay.io/kubernetes-ingress-controller/nginx:0.89 ``` _Creating a replication controller_ diff --git a/images/nginx/rc.yaml b/images/nginx/rc.yaml index 965b7a6a6a..39357b085e 100644 --- a/images/nginx/rc.yaml +++ b/images/nginx/rc.yaml @@ -38,7 +38,7 @@ spec: spec: containers: - name: nginx - image: quay.io/kubernetes-ingress-controller/nginx:0.84 + image: quay.io/kubernetes-ingress-controller/nginx:0.89 ports: - containerPort: 80 - containerPort: 443 diff --git a/images/nginx/rootfs/build.sh b/images/nginx/rootfs/build.sh index 1685799bae..d626327892 100755 --- a/images/nginx/rootfs/build.sh +++ b/images/nginx/rootfs/build.sh @@ -36,6 +36,7 @@ export NGINX_INFLUXDB_VERSION=5b09391cb7b9a889687c0aa67964c06a2d933e8b export GEOIP2_VERSION=3.2 export NGINX_AJP_VERSION=bf6cd93f2098b59260de8d494f0f4b1f11a84627 export RESTY_LUAROCKS_VERSION=3.1.3 +export LUA_RESTY_BALANCER_VERSION=0.03 export BUILD_PATH=/tmp/build @@ -160,6 +161,9 @@ get_src 5f629a50ba22347c441421091da70fdc2ac14586619934534e5a0f8a1390a950 \ get_src c573435f495aac159e34eaa0a3847172a2298eb6295fcdc35d565f9f9b990513 \ "https://luarocks.github.io/luarocks/releases/luarocks-${RESTY_LUAROCKS_VERSION}.tar.gz" +get_src 82209d5a5d9545c6dde3db7857f84345db22162fdea9743d5e2b2094d8d407f8 \ + "https://github.com/openresty/lua-resty-balancer/archive/v${LUA_RESTY_BALANCER_VERSION}.tar.gz" + # improve compilation times CORES=$(($(grep -c ^processor /proc/cpuinfo) - 0)) @@ -450,9 +454,13 @@ export LUA_INCLUDE_DIR=/tmp/build/openresty-1.15.8.1/build/luajit-root/usr/local luarocks install lrexlib-pcre 2.7.2-1 PCRE_LIBDIR=${PCRE_DIR} luarocks install lua-resty-iputils 0.3.0-1 -luarocks install lua-resty-balancer 0.02rc5-0 luarocks install lua-resty-cookie 0.1.0-1 +cd "$BUILD_PATH/lua-resty-balancer-$LUA_RESTY_BALANCER_VERSION" + +make +make install + ln -s $LUA_INCLUDE_DIR /usr/include/lua5.1 /install_lua_resty_waf.sh