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

Update nginx image to fix regression in jaeger tracing (#4803)

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2019-12-02 12:17:26 -03:00 committed by GitHub
parent d890303a3f
commit 97c59728dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 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.93 TAG ?= 0.94
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

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

@ -27,7 +27,7 @@ export NGINX_SUBSTITUTIONS=bc58cb11844bc42735bbaef7085ea86ace46d05b
export NGINX_OPENTRACING_VERSION=0.9.0 export NGINX_OPENTRACING_VERSION=0.9.0
export OPENTRACING_CPP_VERSION=1.5.1 export OPENTRACING_CPP_VERSION=1.5.1
export ZIPKIN_CPP_VERSION=0.5.2 export ZIPKIN_CPP_VERSION=0.5.2
export JAEGER_VERSION=0.5.0 export JAEGER_VERSION=741b1af2805388e98dbfea449f40c6d6b19c13be
export MSGPACK_VERSION=3.2.0 export MSGPACK_VERSION=3.2.0
export DATADOG_CPP_VERSION=1.1.1 export DATADOG_CPP_VERSION=1.1.1
export MODSECURITY_VERSION=d7101e13685efd7e7c9f808871b202656a969f4b export MODSECURITY_VERSION=d7101e13685efd7e7c9f808871b202656a969f4b
@ -94,6 +94,7 @@ clean-install \
nano \ nano \
ssdeep \ ssdeep \
dos2unix mercurial \ dos2unix mercurial \
libyaml-cpp0.6 \
|| exit 1 || exit 1
# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1667178.html # https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1667178.html
@ -146,8 +147,8 @@ get_src 30affaf0f3a84193f7127cc0135da91773ce45d902414082273dae78914f73df \
get_src 5c8d25e68fb852f61489b669aebb7bd8ca8c88ebb5e5f969212fcceff3ee2d0b \ get_src 5c8d25e68fb852f61489b669aebb7bd8ca8c88ebb5e5f969212fcceff3ee2d0b \
"https://github.com/SpiderLabs/ModSecurity-nginx/archive/$MODSECURITY_VERSION.tar.gz" "https://github.com/SpiderLabs/ModSecurity-nginx/archive/$MODSECURITY_VERSION.tar.gz"
get_src c72609a1df7e61771ab9fac4b6d31a187d023cfe765ed488adec714c3cee7cde \ get_src db377619a07d538bdbf328272fdec3893e6f674bdf469b3b575f778866e3ace7 \
"https://github.com/jaegertracing/jaeger-client-cpp/archive/v$JAEGER_VERSION.tar.gz" "https://github.com/jaegertracing/jaeger-client-cpp/archive/$JAEGER_VERSION.tar.gz"
get_src ff865a36bad5c72b8e7ebc4b7cf5f27a820fce4faff9c571c1791e3728355a39 \ get_src ff865a36bad5c72b8e7ebc4b7cf5f27a820fce4faff9c571c1791e3728355a39 \
"https://github.com/msgpack/msgpack-c/archive/cpp-$MSGPACK_VERSION.tar.gz" "https://github.com/msgpack/msgpack-c/archive/cpp-$MSGPACK_VERSION.tar.gz"
@ -526,7 +527,8 @@ apt-mark unmarkauto \
geoip-bin \ geoip-bin \
libyajl2 liblmdb0 libxml2 libpcre++ \ libyajl2 liblmdb0 libxml2 libpcre++ \
gzip \ gzip \
openssl openssl \
libyaml-cpp0.6
apt-get remove -y --purge \ apt-get remove -y --purge \
build-essential \ build-essential \