Skip to content

Commit

Permalink
Update nginx version and remove dumb-init
Browse files Browse the repository at this point in the history
  • Loading branch information
aledbf committed Apr 4, 2017
1 parent ea7f943 commit 62c13fb
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions controllers/nginx/rootfs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM gcr.io/google_containers/nginx-slim:0.14
FROM gcr.io/google_containers/nginx-slim:0.15

RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y \
diffutils \
Expand All @@ -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"]

0 comments on commit 62c13fb

Please sign in to comment.