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

Merge pull request #2588 from aledbf/update-nginx

Browse source 
Update nginx dependencies
This commit is contained in:
k8s-ci-robot 2018-05-31 12:30:56 -07:00 committed by GitHub
commit aeab2002f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
images/nginx/Makefile
View file

@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
# 0.0.0 shouldn't clobber any released builds # 0.0.0 shouldn't clobber any released builds
TAG ?= 0.48 TAG ?= 0.49
REGISTRY ?= quay.io/kubernetes-ingress-controller REGISTRY ?= quay.io/kubernetes-ingress-controller
ARCH ?= $(shell go env GOARCH) ARCH ?= $(shell go env GOARCH)
DOCKER ?= docker DOCKER ?= docker

9
images/nginx/build.sh
View file

@ -85,7 +85,6 @@ clean-install \
libcurl4-openssl-dev \ libcurl4-openssl-dev \
procps \ procps \
git g++ pkgconf flex bison doxygen libyajl-dev liblmdb-dev libtool dh-autoreconf libxml2 libpcre++-dev libxml2-dev \ git g++ pkgconf flex bison doxygen libyajl-dev liblmdb-dev libtool dh-autoreconf libxml2 libpcre++-dev libxml2-dev \
lua-cjson \
python \ python \
luarocks \ luarocks \
|| exit 1 || exit 1
@ -204,6 +203,13 @@ export MAKEFLAGS=-j${CORES}
export CTEST_BUILD_FLAGS=${MAKEFLAGS} export CTEST_BUILD_FLAGS=${MAKEFLAGS}
export HUNTER_JOBS_NUMBER=${CORES} export HUNTER_JOBS_NUMBER=${CORES}
# Installing luarocks packages
if [[ ${ARCH} == "x86_64" ]]; then
luarocks install lrexlib-pcre 2.7.2-1
fi
luarocks install lua-cjson 2.1.0.6-1
# luajit is not available on ppc64le and s390x # luajit is not available on ppc64le and s390x
if [[ (${ARCH} != "ppc64le") && (${ARCH} != "s390x") ]]; then if [[ (${ARCH} != "ppc64le") && (${ARCH} != "s390x") ]]; then
cd "$BUILD_PATH/luajit2-2.1-20180420" cd "$BUILD_PATH/luajit2-2.1-20180420"
@ -244,7 +250,6 @@ if [[ (${ARCH} != "ppc64le") && (${ARCH} != "s390x") ]]; then
# build and install lua-resty-waf with dependencies # build and install lua-resty-waf with dependencies
/install_lua_resty_waf.sh /install_lua_resty_waf.sh
fi fi
# build opentracing lib # build opentracing lib

7
images/nginx/install_lua_resty_waf.sh
View file

@ -30,6 +30,7 @@ if [[ ${ARCH} != "x86_64" ]]; then
sed -i 's/CFLAGS = -msse2 -msse3 -msse4.1 -O3/CFLAGS = -O3/' lua-aho-corasick/Makefile sed -i 's/CFLAGS = -msse2 -msse3 -msse4.1 -O3/CFLAGS = -O3/' lua-aho-corasick/Makefile
# export PCRE lib directory # export PCRE lib directory
export PCRE_LIBDIR=$(find /usr/lib -name libpcre*.so* | head -1 | xargs dirname) export PCRE_LIBDIR=$(find /usr/lib -name libpcre*.so* | head -1 | xargs dirname)
luarocks install lrexlib-pcre 2.7.2-1 PCRE_LIBDIR=${PCRE_LIBDIR}
fi fi
make make
@ -55,12 +56,6 @@ git clone -b master --single-branch https://github.com/bungle/lua-resty-random.g
cd "$BUILD_PATH/lua-resty-cookie" cd "$BUILD_PATH/lua-resty-cookie"
make install make install
if [[ ${ARCH} != "x86_64" ]]; then
luarocks install lrexlib-pcre 2.7.2-1 PCRE_LIBDIR=${PCRE_LIBDIR}
else
luarocks install lrexlib-pcre 2.7.2-1
fi
# and do the rest of what "make instal" does # and do the rest of what "make instal" does
cd "$BUILD_PATH/lua-resty-waf" cd "$BUILD_PATH/lua-resty-waf"
install -d "$LUA_LIB_DIR/resty/waf/storage" install -d "$LUA_LIB_DIR/resty/waf/storage"