From 8fb0c176f1dd22aef4881bf8b78029847c4bb59f Mon Sep 17 00:00:00 2001 From: Jonas Kalderstam Date: Wed, 14 Mar 2018 15:25:29 +0100 Subject: [PATCH] Wrap entrypoint with tini Tini is a tiny "init-system" which handles signal forwarding to child processes and most importantly handles reaping child processes. Read more about it at https://blog.phusion.nl/2015/01/20/docker-and-the-pid-1-zombie-reaping-problem/ https://github.com/krallin/tini/issues/8 https://github.com/docker-library/official-images#init --- src/3.1/Dockerfile | 5 +++-- src/3.2/Dockerfile | 5 +++-- src/3.3/Dockerfile | 5 +++-- src/3.4/Dockerfile | 5 +++-- test/container/Dockerfile | 3 ++- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/3.1/Dockerfile b/src/3.1/Dockerfile index 6d89ccd7..63714329 100644 --- a/src/3.1/Dockerfile +++ b/src/3.1/Dockerfile @@ -2,7 +2,8 @@ FROM openjdk:8-jre-alpine RUN apk add --no-cache --quiet \ bash \ - curl + curl \ + tini ENV NEO4J_SHA256=%%NEO4J_SHA%% \ NEO4J_TARBALL=%%NEO4J_TARBALL%% @@ -29,5 +30,5 @@ COPY docker-entrypoint.sh /docker-entrypoint.sh EXPOSE 7474 7473 7687 -ENTRYPOINT ["/docker-entrypoint.sh"] +ENTRYPOINT ["/sbin/tini", "-g", "--", "/docker-entrypoint.sh"] CMD ["neo4j"] diff --git a/src/3.2/Dockerfile b/src/3.2/Dockerfile index a88392d3..918970e4 100644 --- a/src/3.2/Dockerfile +++ b/src/3.2/Dockerfile @@ -2,7 +2,8 @@ FROM openjdk:8-jre-alpine RUN apk add --no-cache --quiet \ bash \ - curl + curl \ + tini ENV NEO4J_SHA256=%%NEO4J_SHA%% \ NEO4J_TARBALL=%%NEO4J_TARBALL%% @@ -29,5 +30,5 @@ COPY docker-entrypoint.sh /docker-entrypoint.sh EXPOSE 7474 7473 7687 -ENTRYPOINT ["/docker-entrypoint.sh"] +ENTRYPOINT ["/sbin/tini", "-g", "--", "/docker-entrypoint.sh"] CMD ["neo4j"] diff --git a/src/3.3/Dockerfile b/src/3.3/Dockerfile index 77a9b43a..f466d7c5 100644 --- a/src/3.3/Dockerfile +++ b/src/3.3/Dockerfile @@ -2,7 +2,8 @@ FROM openjdk:8-jre-alpine RUN apk add --no-cache --quiet \ bash \ - curl + curl \ + tini ENV NEO4J_SHA256=%%NEO4J_SHA%% \ NEO4J_TARBALL=%%NEO4J_TARBALL%% \ @@ -30,5 +31,5 @@ COPY docker-entrypoint.sh /docker-entrypoint.sh EXPOSE 7474 7473 7687 -ENTRYPOINT ["/docker-entrypoint.sh"] +ENTRYPOINT ["/sbin/tini", "-g", "--", "/docker-entrypoint.sh"] CMD ["neo4j"] diff --git a/src/3.4/Dockerfile b/src/3.4/Dockerfile index 77a9b43a..f466d7c5 100644 --- a/src/3.4/Dockerfile +++ b/src/3.4/Dockerfile @@ -2,7 +2,8 @@ FROM openjdk:8-jre-alpine RUN apk add --no-cache --quiet \ bash \ - curl + curl \ + tini ENV NEO4J_SHA256=%%NEO4J_SHA%% \ NEO4J_TARBALL=%%NEO4J_TARBALL%% \ @@ -30,5 +31,5 @@ COPY docker-entrypoint.sh /docker-entrypoint.sh EXPOSE 7474 7473 7687 -ENTRYPOINT ["/docker-entrypoint.sh"] +ENTRYPOINT ["/sbin/tini", "-g", "--", "/docker-entrypoint.sh"] CMD ["neo4j"] diff --git a/test/container/Dockerfile b/test/container/Dockerfile index 79ddf356..610cd0d3 100644 --- a/test/container/Dockerfile +++ b/test/container/Dockerfile @@ -1,5 +1,6 @@ FROM alpine -RUN apk update && apk add --no-cache curl bash util-linux grep +RUN apk update && apk add --no-cache curl bash util-linux grep tini +ENTRYPOINT ["/sbin/tini", "-g", "--"] CMD ["bash", "-c", "while true; do sleep 120; done"]