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

Update nginx image

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2018-10-10 10:14:07 -03:00
parent dcc6495f0a
commit 3de8b48a80
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -50,7 +50,7 @@ DUMB_ARCH = ${ARCH}
GOBUILD_FLAGS := GOBUILD_FLAGS :=
ALL_ARCH = amd64 arm arm64 ppc64le s390x ALL_ARCH = amd64 arm arm64 ppc64le
QEMUVERSION = v2.12.0-1 QEMUVERSION = v2.12.0-1
@ -61,7 +61,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
MULTI_ARCH_IMG = $(IMAGE)-$(ARCH) MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
# Set default base image dynamically for each arch # Set default base image dynamically for each arch
BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.64 BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.65
ifeq ($(ARCH),arm) ifeq ($(ARCH),arm)
QEMUARCH=arm QEMUARCH=arm

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

@ -40,7 +40,7 @@ if [ "$missing" = true ];then
exit 1 exit 1
fi fi
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v10042018-c8abff1 E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v10102018-dcc6495
DOCKER_OPTS=${DOCKER_OPTS:-""} DOCKER_OPTS=${DOCKER_OPTS:-""}
@ -69,7 +69,6 @@ docker run \
--rm \ --rm \
${DOCKER_OPTS} \ ${DOCKER_OPTS} \
-v ${HOME}/.kube:/${HOME}/.kube \ -v ${HOME}/.kube:/${HOME}/.kube \
-v ${HOME}/.minikube:${HOME}/.minikube \
-v ${PWD}:/go/src/${PKG} \ -v ${PWD}:/go/src/${PKG} \
-v ${PWD}/.gocache:${HOME}/.cache/go-build \ -v ${PWD}/.gocache:${HOME}/.cache/go-build \
-v ${PWD}/bin/${ARCH}:/go/bin/linux_${ARCH} \ -v ${PWD}/bin/${ARCH}:/go/bin/linux_${ARCH} \

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

@ -236,6 +236,18 @@ else
fi fi
# Installing luarocks packages # Installing luarocks packages
if [[ ${ARCH} == "armv7l" ]]; then
export PCRE_DIR=/usr/lib/armhf-linux-gnu
fi
if [[ ${ARCH} == "aarch64" ]]; then
export PCRE_DIR=/usr/lib/aarch64-linux-gnu
fi
if [[ ${ARCH} == "ppc64le" ]]; then
export PCRE_DIR=/usr/lib/powerpc64le-linux-gnu
fi
luarocks install lrexlib-pcre 2.7.2-1 luarocks install lrexlib-pcre 2.7.2-1
cd "$BUILD_PATH/lua-resty-core-0.1.15" cd "$BUILD_PATH/lua-resty-core-0.1.15"