Handles Ctrl+C in docker run, but exit in docker-compose is still slow

solsson · solsson · commit 78af80fd21af · 2017-11-24T14:11:48.000+01:00
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,2 @@
+.git
+node_modules
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,11 @@
 FROM yolean/node@sha256:230b269710a1d09b9ebbdeeea0fc4e69ac1388ab71b0178452e817065f69c700
-COPY . /app
+
 WORKDIR /app
-RUN npm install
 
-ENTRYPOINT ["node"]
-CMD ["./index.js"]
+COPY package.json package-lock.json ./
+RUN npm install --production
+
+COPY . .
+
+ENTRYPOINT ["node", "./index.js"]
+CMD []
diff --git a/index.js b/index.js
@@ -37,6 +37,24 @@ app.all('*', (req, res) => {
     }
   }
   res.json(echo);
-})
+});
 
-app.listen(process.env.PORT || 80)
+const server = app.listen(process.env.PORT || 80);
+let calledClose = false;
+
+process.on('exit', function () {
+  if (calledClose) return;
+  console.log('Got exit event. Trying to stop Express server.');
+  server.close(function() {
+    console.log("Express server closed");
+  });
+});
+
+process.on('SIGINT', function() {
+  console.log('Got SIGINT. Trying to exit gracefully.');
+  calledClose = true;
+  server.close(function() {
+    console.log("Exoress server closed. Asking process to exit.");
+    process.exit()
+  });
+});
