diff --git a/Makefile b/Makefile index e37a92736..ca297c1f6 100644 --- a/Makefile +++ b/Makefile @@ -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.62 +BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.63 ifeq ($(ARCH),arm) QEMUARCH=arm diff --git a/build/go-in-docker.sh b/build/go-in-docker.sh index e1716c1ac..463647622 100755 --- a/build/go-in-docker.sh +++ b/build/go-in-docker.sh @@ -40,7 +40,7 @@ if [ "$missing" = true ];then exit 1 fi -E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v09122018-167ed7f +E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v09252018-471049b DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/images/e2e/Dockerfile b/images/e2e/Dockerfile index 0c75708dd..42373160c 100644 --- a/images/e2e/Dockerfile +++ b/images/e2e/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.61 +FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.63 RUN clean-install \ g++ \ diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile index 1af40c358..458523115 100644 --- a/rootfs/Dockerfile +++ b/rootfs/Dockerfile @@ -20,8 +20,7 @@ WORKDIR /etc/nginx RUN clean-install \ diffutils \ - valgrind \ - dumb-init + libcap2-bin COPY . / @@ -43,6 +42,9 @@ RUN bash -eu -c ' \ && chown www-data.www-data /etc/nginx/nginx.conf \ && chown www-data.www-data /etc/nginx/opentracing.json +RUN setcap cap_net_bind_service=+ep /nginx-ingress-controller \ + && setcap -v cap_net_bind_service=+ep /nginx-ingress-controller + # Create symlinks to redirect nginx logs to stdout and stderr docker log collector # This only works if nginx is started with CMD or ENTRYPOINT RUN ln -sf /dev/stdout /var/log/nginx/access.log