Merge pull request #556 from aledbf/update-nginx-controller

Update nginx version and remove dumb-init
kubernetes · Apr 6, 2017 · 427c5c7 · 427c5c7
2 parents ed6987e + 62c13fb
commit 427c5c7
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/controllers/nginx/rootfs/Dockerfile b/controllers/nginx/rootfs/Dockerfile
@@ -21,10 +21,4 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y \
 
 COPY . /
 
-# https://blog.phusion.nl/2015/01/20/docker-and-the-pid-1-zombie-reaping-problem
-RUN curl -sSL -o /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64 && \
-  chmod +x /sbin/dumb-init
-
-ENTRYPOINT ["/sbin/dumb-init", "--"]
-
 CMD ["/nginx-ingress-controller"]