diff --git a/images/nginx/Makefile b/images/nginx/Makefile index 5e11f4e6e..19528e00d 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.61 +TAG ?= 0.62 REGISTRY ?= quay.io/kubernetes-ingress-controller ARCH ?= $(shell go env GOARCH) DOCKER ?= docker diff --git a/images/nginx/rootfs/build.sh b/images/nginx/rootfs/build.sh index 8123f58fe..8e6cdbe8a 100755 --- a/images/nginx/rootfs/build.sh +++ b/images/nginx/rootfs/build.sh @@ -243,7 +243,7 @@ fi # luajit is not available on ppc64le and s390x if [[ (${ARCH} != "ppc64le") && (${ARCH} != "s390x") ]]; then cd "$BUILD_PATH/luajit2-2.1-20180420" - make + make CCDEBUG=-g make install export LUAJIT_LIB=/usr/local/lib @@ -282,6 +282,22 @@ if [[ (${ARCH} != "ppc64le") && (${ARCH} != "s390x") ]]; then /install_lua_resty_waf.sh fi +# install openresty-gdb-utils +cd / +git clone --depth=1 https://github.com/openresty/openresty-gdb-utils.git +cat > ~/.gdbinit << EOF +directory /openresty-gdb-utils + +py import sys +py sys.path.append("/openresty-gdb-utils") + +source luajit20.gdb +source ngx-lua.gdb +source luajit21.py +source ngx-raw-req.py +set python print-stack full +EOF + # build opentracing lib cd "$BUILD_PATH/opentracing-cpp-$OPENTRACING_CPP_VERSION" mkdir .build