From 72bd629022b5fffea137039845b4f750625d51d0 Mon Sep 17 00:00:00 2001 From: Daisuke Fujita Date: Mon, 23 Oct 2017 11:04:27 +0900 Subject: [PATCH] Wrap Node.js server with tini --- Dockerfile | 8 +++++++- Dockerfile-alpine | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 91330596..d91e45e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,11 @@ FROM node MAINTAINER Niko Bellic +# wrap Node.js process with tini to handle stop signal +ENV TINI_VERSION v0.16.1 +RUN wget -O /tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini \ + && chmod +x /tini + RUN mkdir -p /usr/src/app WORKDIR /usr/src/app @@ -13,4 +18,5 @@ COPY . /usr/src/app EXPOSE 9100 -CMD grunt server +ENTRYPOINT ["/tini", "--"] +CMD ["grunt", "server"] diff --git a/Dockerfile-alpine b/Dockerfile-alpine index 34f3aca0..20fd0d06 100644 --- a/Dockerfile-alpine +++ b/Dockerfile-alpine @@ -1,8 +1,15 @@ # docker build -t mobz/elasticsearch-head:5-alpine -f Dockerfile-alpine . FROM node:alpine + +# wrap Node.js process with tini to handle stop signal +RUN apk add --no-cache --update tini + WORKDIR /usr/src/app RUN npm install http-server COPY . . + EXPOSE 9100 -CMD node_modules/http-server/bin/http-server _site -p 9100 + +ENTRYPOINT ["tini", "--"] +CMD ["node_modules/http-server/bin/http-server", "_site", "-p", "9100"]