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

Update nginx to 1.15.10

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2019-03-26 15:39:34 -03:00
parent b033fbf0b2
commit 1e9567b1c0
No known key found for this signature in database
GPG key ID: 786136016A8BA02A
2 changed files with 6 additions and 6 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.82 TAG ?= 0.83
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

@ -19,7 +19,7 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
export NGINX_VERSION=1.15.9 export NGINX_VERSION=1.15.10
export NDK_VERSION=0.3.1rc1 export NDK_VERSION=0.3.1rc1
export SETMISC_VERSION=0.32 export SETMISC_VERSION=0.32
export MORE_HEADERS_VERSION=0.33 export MORE_HEADERS_VERSION=0.33
@ -130,7 +130,7 @@ mkdir --verbose -p "$BUILD_PATH"
cd "$BUILD_PATH" cd "$BUILD_PATH"
# download, verify and extract the source files # download, verify and extract the source files
get_src e4cfba989bba614cd53f3f406ac6da9f05977d6b1296e5d20a299f10c2d7ae43 \ get_src b865743abd52bce4745d0f7e7fedde3cafbaaab617b022c105e3e4e456537c3c \
"https://nginx.org/download/nginx-$NGINX_VERSION.tar.gz" "https://nginx.org/download/nginx-$NGINX_VERSION.tar.gz"
get_src 49f50d4cd62b166bc1aaf712febec5e028d9f187cedbc27a610dfd01bdde2d36 \ get_src 49f50d4cd62b166bc1aaf712febec5e028d9f187cedbc27a610dfd01bdde2d36 \
@ -184,8 +184,8 @@ get_src 2a69815e4ae01aa8b170941a8e1a10b6f6a9aab699dee485d58f021dd933829a \
get_src 342709c8e55e9901a91e90cb83153ff588d88be27c4370954b5a2e470e53d26f \ get_src 342709c8e55e9901a91e90cb83153ff588d88be27c4370954b5a2e470e53d26f \
"https://github.com/openresty/lua-resty-lrucache/archive/v0.09rc1.tar.gz" "https://github.com/openresty/lua-resty-lrucache/archive/v0.09rc1.tar.gz"
get_src f3bf9a35c66b00594d13b9e22c2e8f07fdaeedc6e790e2ca4675a886d5b5e4da \ get_src a6bd1c27291eed3df01225931346a0c78651a71d7c52839227e466eec2df2e63 \
"https://github.com/openresty/lua-resty-core/archive/v0.1.16rc4.tar.gz" "https://github.com/openresty/lua-resty-core/archive/v0.1.16.tar.gz"
get_src 517db9add320250b770f2daac83a49e38e6131611f2daa5ff05c69d5705e9746 \ get_src 517db9add320250b770f2daac83a49e38e6131611f2daa5ff05c69d5705e9746 \
"https://github.com/openresty/lua-resty-lock/archive/v0.08rc1.tar.gz" "https://github.com/openresty/lua-resty-lock/archive/v0.08rc1.tar.gz"
@ -251,7 +251,7 @@ fi
cd "$BUILD_PATH" cd "$BUILD_PATH"
luarocks install lrexlib-pcre 2.7.2-1 PCRE_LIBDIR=${PCRE_DIR} luarocks install lrexlib-pcre 2.7.2-1 PCRE_LIBDIR=${PCRE_DIR}
cd "$BUILD_PATH/lua-resty-core-0.1.16rc4" cd "$BUILD_PATH/lua-resty-core-0.1.16"
make install make install
cd "$BUILD_PATH/lua-resty-lrucache-0.09rc1" cd "$BUILD_PATH/lua-resty-lrucache-0.09rc1"