diff --git a/images/nginx/Makefile b/images/nginx/Makefile index 19528e00d..7cb6a5ca3 100644 --- a/images/nginx/Makefile +++ b/images/nginx/Makefile @@ -13,7 +13,7 @@ # limitations under the License. # 0.0.0 shouldn't clobber any released builds -TAG ?= 0.62 +TAG ?= 0.63 REGISTRY ?= quay.io/kubernetes-ingress-controller ARCH ?= $(shell go env GOARCH) DOCKER ?= docker diff --git a/images/nginx/rc.yaml b/images/nginx/rc.yaml index 692170439..cbf6e6c6b 100644 --- a/images/nginx/rc.yaml +++ b/images/nginx/rc.yaml @@ -8,12 +8,12 @@ metadata: spec: type: NodePort ports: - - port: 80 - protocol: TCP - name: http - - port: 443 - protocol: TCP - name: https + - port: 80 + protocol: TCP + name: http + - port: 443 + protocol: TCP + name: https selector: app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx @@ -37,8 +37,8 @@ spec: app.kubernetes.io/part-of: ingress-nginx spec: containers: - - name: nginx - image: quay.io/kubernetes-ingress-controller/nginx:0.56 - ports: - - containerPort: 80 - - containerPort: 443 + - name: nginx + image: quay.io/kubernetes-ingress-controller/nginx:0.63 + ports: + - containerPort: 80 + - containerPort: 443 diff --git a/images/nginx/rootfs/build.sh b/images/nginx/rootfs/build.sh index 8e6cdbe8a..1e54027be 100755 --- a/images/nginx/rootfs/build.sh +++ b/images/nginx/rootfs/build.sh @@ -19,7 +19,7 @@ set -o errexit set -o nounset set -o pipefail -export NGINX_VERSION=1.15.3 +export NGINX_VERSION=1.15.4 export NDK_VERSION=0.3.1rc1 export SETMISC_VERSION=0.32 export STICKY_SESSIONS_VERSION=08a395c66e42 @@ -94,6 +94,7 @@ clean-install \ authbind \ dumb-init \ gdb \ + valgrind \ || exit 1 if [[ ${ARCH} == "x86_64" ]]; then @@ -144,7 +145,7 @@ mkdir --verbose -p "$BUILD_PATH" cd "$BUILD_PATH" # download, verify and extract the source files -get_src 9391fb91c3e2ebd040a4e3ac2b2f0893deb6232edc30a8e16fcc9c3fa9d6be85 \ +get_src 3324776c800d974ceae8797ab9102ca26a8c3656f5c6fb3f31f2cb1e719458e7 \ "http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz" get_src 49f50d4cd62b166bc1aaf712febec5e028d9f187cedbc27a610dfd01bdde2d36 \ @@ -457,7 +458,8 @@ WITH_FLAGS="--with-debug \ --with-stream_ssl_module \ --with-stream_ssl_preread_module \ --with-threads \ - --with-http_secure_link_module" + --with-http_secure_link_module \ + --with-http_gunzip_module" if [[ ${ARCH} != "armv7l" || ${ARCH} != "aarch64" ]]; then WITH_FLAGS+=" --with-file-aio" @@ -595,7 +597,8 @@ for dir in "${writeDirs[@]}"; do chown -R www-data.www-data ${dir}; done -chmod 755 /etc/authbind/byuid/33 -chown www-data /etc/authbind/byuid/33 -chmod 755 /etc/authbind/byport/* -chown www-data /etc/authbind/byport/* +for value in {1..1023};do + touch /etc/authbind/byport/$value + chown www-data /etc/authbind/byport/$value + chmod 755 /etc/authbind/byport/$value +done diff --git a/images/nginx/rootfs/etc/authbind/byport/443 b/images/nginx/rootfs/etc/authbind/byport/443 deleted file mode 100644 index e69de29bb..000000000 diff --git a/images/nginx/rootfs/etc/authbind/byport/80 b/images/nginx/rootfs/etc/authbind/byport/80 deleted file mode 100644 index e69de29bb..000000000 diff --git a/images/nginx/rootfs/etc/authbind/byuid/33 b/images/nginx/rootfs/etc/authbind/byuid/33 deleted file mode 100644 index a6b2542c7..000000000 --- a/images/nginx/rootfs/etc/authbind/byuid/33 +++ /dev/null @@ -1,4 +0,0 @@ -0.0.0.0:1-1023 -0.0.0.0:1-1023 -::0:1-1023 -::0:1-1023