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

Update nginx image and QEMU version

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2018-10-29 10:58:06 -03:00
parent d68b90d49a
commit a42f181d73
No known key found for this signature in database
GPG key ID: 786136016A8BA02A
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -52,7 +52,7 @@ GOBUILD_FLAGS :=
ALL_ARCH = amd64 arm arm64 ppc64le
QEMUVERSION = v2.12.0-1
QEMUVERSION = v3.0.0
BUSTED_ARGS =-v --pattern=_test
@ -61,7 +61,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
# Set default base image dynamically for each arch
BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.65
BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.66
ifeq ($(ARCH),arm)
QEMUARCH=arm

2
build/go-in-docker.sh
View file

@ -40,7 +40,7 @@ if [ "$missing" = true ];then
exit 1
fi
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v10102018-dcc6495
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v10292018-5d42f0e
DOCKER_OPTS=${DOCKER_OPTS:-""}

2
images/nginx/Makefile
View file

@ -26,7 +26,7 @@ ifeq ($(GOHOSTOS),darwin)
SED_I=sed -i ''
endif
QEMUVERSION=v2.12.0-1
QEMUVERSION=v3.0.0
IMGNAME = nginx
IMAGE = $(REGISTRY)/$(IMGNAME)

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

@ -29,13 +29,13 @@ export NGINX_OPENTRACING_VERSION=0.6.0
export OPENTRACING_CPP_VERSION=1.5.0
export ZIPKIN_CPP_VERSION=0.5.2
export JAEGER_VERSION=ba0fa3fa6dbb01995d996f988a897e272100bf95
export MODSECURITY_VERSION=37b76e88df4bce8a9846345c27271d7e6ce1acfb
export MODSECURITY_VERSION=56cfa4e4805bb6134b97143052a9b48919cc294f
export LUA_NGX_VERSION=e94f2e5d64daa45ff396e262d8dab8e56f5f10e0
export LUA_UPSTREAM_VERSION=0.07
export NGINX_INFLUXDB_VERSION=f20cfb2458c338f162132f5a21eb021e2cbe6383
export NGINX_INFLUXDB_VERSION=0e2cb6cbf850a29c81e44be9e33d9a15d45c50e8
export GEOIP2_VERSION=3.2
export NGINX_AJP_VERSION=bf6cd93f2098b59260de8d494f0f4b1f11a84627
export LUAJIT_VERSION=8e35a1932250b0313c06393061f332c760efdf40
export LUAJIT_VERSION=c58fe79b870f1934479bf14fe8035fc3d9fdfde2
export BUILD_PATH=/tmp/build
@ -253,7 +253,7 @@ dpkg-buildpackage -rfakeroot
cd ..
dpkg -i openssl_1.1.1-1_amd64.deb libssl1.1_1.1.1-1_amd64.deb libssl-dev_1.1.1-1_amd64.deb
dpkg -i openssl_1.1.1-1_*.deb libssl1.1_1.1.1-1_*.deb libssl-dev_1.1.1-1_*.deb
# Install luajit from openresty fork
export LUAJIT_LIB=/usr/local/lib