Update nginx to 1.15.4
This commit is contained in:
parent
c4a562dded
commit
9096822895
6 changed files with 22 additions and 23 deletions
|
@ -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.62
|
TAG ?= 0.63
|
||||||
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
|
||||||
|
|
|
@ -8,12 +8,12 @@ metadata:
|
||||||
spec:
|
spec:
|
||||||
type: NodePort
|
type: NodePort
|
||||||
ports:
|
ports:
|
||||||
- port: 80
|
- port: 80
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
name: http
|
name: http
|
||||||
- port: 443
|
- port: 443
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
name: https
|
name: https
|
||||||
selector:
|
selector:
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
|
@ -37,8 +37,8 @@ spec:
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: nginx
|
- name: nginx
|
||||||
image: quay.io/kubernetes-ingress-controller/nginx:0.56
|
image: quay.io/kubernetes-ingress-controller/nginx:0.63
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 80
|
- containerPort: 80
|
||||||
- containerPort: 443
|
- containerPort: 443
|
||||||
|
|
|
@ -19,7 +19,7 @@ set -o errexit
|
||||||
set -o nounset
|
set -o nounset
|
||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
export NGINX_VERSION=1.15.3
|
export NGINX_VERSION=1.15.4
|
||||||
export NDK_VERSION=0.3.1rc1
|
export NDK_VERSION=0.3.1rc1
|
||||||
export SETMISC_VERSION=0.32
|
export SETMISC_VERSION=0.32
|
||||||
export STICKY_SESSIONS_VERSION=08a395c66e42
|
export STICKY_SESSIONS_VERSION=08a395c66e42
|
||||||
|
@ -94,6 +94,7 @@ clean-install \
|
||||||
authbind \
|
authbind \
|
||||||
dumb-init \
|
dumb-init \
|
||||||
gdb \
|
gdb \
|
||||||
|
valgrind \
|
||||||
|| exit 1
|
|| exit 1
|
||||||
|
|
||||||
if [[ ${ARCH} == "x86_64" ]]; then
|
if [[ ${ARCH} == "x86_64" ]]; then
|
||||||
|
@ -144,7 +145,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 9391fb91c3e2ebd040a4e3ac2b2f0893deb6232edc30a8e16fcc9c3fa9d6be85 \
|
get_src 3324776c800d974ceae8797ab9102ca26a8c3656f5c6fb3f31f2cb1e719458e7 \
|
||||||
"http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz"
|
"http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz"
|
||||||
|
|
||||||
get_src 49f50d4cd62b166bc1aaf712febec5e028d9f187cedbc27a610dfd01bdde2d36 \
|
get_src 49f50d4cd62b166bc1aaf712febec5e028d9f187cedbc27a610dfd01bdde2d36 \
|
||||||
|
@ -457,7 +458,8 @@ WITH_FLAGS="--with-debug \
|
||||||
--with-stream_ssl_module \
|
--with-stream_ssl_module \
|
||||||
--with-stream_ssl_preread_module \
|
--with-stream_ssl_preread_module \
|
||||||
--with-threads \
|
--with-threads \
|
||||||
--with-http_secure_link_module"
|
--with-http_secure_link_module \
|
||||||
|
--with-http_gunzip_module"
|
||||||
|
|
||||||
if [[ ${ARCH} != "armv7l" || ${ARCH} != "aarch64" ]]; then
|
if [[ ${ARCH} != "armv7l" || ${ARCH} != "aarch64" ]]; then
|
||||||
WITH_FLAGS+=" --with-file-aio"
|
WITH_FLAGS+=" --with-file-aio"
|
||||||
|
@ -595,7 +597,8 @@ for dir in "${writeDirs[@]}"; do
|
||||||
chown -R www-data.www-data ${dir};
|
chown -R www-data.www-data ${dir};
|
||||||
done
|
done
|
||||||
|
|
||||||
chmod 755 /etc/authbind/byuid/33
|
for value in {1..1023};do
|
||||||
chown www-data /etc/authbind/byuid/33
|
touch /etc/authbind/byport/$value
|
||||||
chmod 755 /etc/authbind/byport/*
|
chown www-data /etc/authbind/byport/$value
|
||||||
chown www-data /etc/authbind/byport/*
|
chmod 755 /etc/authbind/byport/$value
|
||||||
|
done
|
||||||
|
|
|
@ -1,4 +0,0 @@
|
||||||
0.0.0.0:1-1023
|
|
||||||
0.0.0.0:1-1023
|
|
||||||
::0:1-1023
|
|
||||||
::0:1-1023
|
|
Loading…
Reference in a new issue