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

Merge pull request #3782 from ElvinEfendi/lua-bridge-tracer

Browse source 
Lua bridge tracer
This commit is contained in:
Kubernetes Prow Robot 2019-02-20 07:28:50 -08:00 committed by GitHub
commit 5c6676da55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 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.77 TAG ?= 0.78
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

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

@ -31,6 +31,7 @@ export ZIPKIN_CPP_VERSION=0.5.2
export JAEGER_VERSION=cdfaf5bb25ff5f8ec179fd548e6c7c2ade9a6a09 export JAEGER_VERSION=cdfaf5bb25ff5f8ec179fd548e6c7c2ade9a6a09
export MSGPACK_VERSION=3.1.1 export MSGPACK_VERSION=3.1.1
export DATADOG_CPP_VERSION=0.4.2 export DATADOG_CPP_VERSION=0.4.2
export LUA_BRIDGE_TRACER_VERSION=0.1.0
export MODSECURITY_VERSION=fc061a57a8b0abda79b17cbe103d78db803fa575 export MODSECURITY_VERSION=fc061a57a8b0abda79b17cbe103d78db803fa575
export LUA_NGX_VERSION=fd90f4e8252e9d06419317fdf525b55c65e15a50 export LUA_NGX_VERSION=fd90f4e8252e9d06419317fdf525b55c65e15a50
export LUA_STREAM_NGX_VERSION=0.0.6rc5 export LUA_STREAM_NGX_VERSION=0.0.6rc5
@ -50,6 +51,8 @@ get_src()
url="$2" url="$2"
f=$(basename "$url") f=$(basename "$url")
echo "Downloading $url"
curl -sSL "$url" -o "$f" curl -sSL "$url" -o "$f"
echo "$hash $f" | sha256sum -c - || exit 10 echo "$hash $f" | sha256sum -c - || exit 10
tar xzf "$f" tar xzf "$f"
@ -167,6 +170,9 @@ get_src bda49f996a73d2c6080ff0523e7b535917cd28c8a79c3a5da54fc29332d61d1e \
get_src a3d1c03e7af570fa64c01df259e6e9bb78637a6bd9c65c6bf7e8703e466dc22f \ get_src a3d1c03e7af570fa64c01df259e6e9bb78637a6bd9c65c6bf7e8703e466dc22f \
"https://github.com/DataDog/dd-opentracing-cpp/archive/v$DATADOG_CPP_VERSION.tar.gz" "https://github.com/DataDog/dd-opentracing-cpp/archive/v$DATADOG_CPP_VERSION.tar.gz"
get_src c29183001e3ab48299deecd02fb84b799b6627817c9baa66e4b342ac81dd6b40\
"https://github.com/opentracing/lua-bridge-tracer/archive/v$LUA_BRIDGE_TRACER_VERSION.tar.gz"
get_src 8ff5b18f4ff75ecdb852f50ce2069213d36285fa5f584c28e03ff978fe62d99a \ get_src 8ff5b18f4ff75ecdb852f50ce2069213d36285fa5f584c28e03ff978fe62d99a \
"https://github.com/openresty/lua-nginx-module/archive/$LUA_NGX_VERSION.tar.gz" "https://github.com/openresty/lua-nginx-module/archive/$LUA_NGX_VERSION.tar.gz"
@ -385,6 +391,14 @@ cmake ..
make make
make install make install
# build Lua bridge tracer
cd "$BUILD_PATH/lua-bridge-tracer-$LUA_BRIDGE_TRACER_VERSION"
mkdir .build
cd .build
cmake ..
make
make install
# Get Brotli source and deps # Get Brotli source and deps
cd "$BUILD_PATH" cd "$BUILD_PATH"
git clone --depth=1 https://github.com/google/ngx_brotli.git git clone --depth=1 https://github.com/google/ngx_brotli.git