Merge branch 'master' into upstream_master

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [4.0.12] - 2019-11-21
+### Added
+- Added a entrypoint file so the node.js process is not the root process, so it responds to SIGINT calls (Ctrl+C).
+
 ## [4.0.11] - 2019-01-15
 ### Changed
 - Updates `multi-rpc` to version 1.5.5.

Dockerfile

@@ -20,7 +20,9 @@ USER tor_router
 
 ADD package.json /app/package.json
 
-RUN npm install 
+ADD package-lock.json /app/package-lock.json
+
+RUN npm ci 
 
 ADD . /app
 
@@ -28,6 +30,6 @@ ENV HOME /home/tor_router
 
 EXPOSE 9050 9053 9077
 
-ENTRYPOINT [ "tor-router" ]
+ENTRYPOINT [ "/bin/bash", "/app/docker-entrypoint.sh" ]
 
 CMD [ "-s", "-d", "-j", "1" ]

docker-entrypoint.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/app/bin/tor-router $@

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "tor-router",
-  "version": "4.0.11",
+  "version": "4.0.12",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -724,6 +724,12 @@
       "resolved": "https://registry.npmjs.org/event-lite/-/event-lite-0.1.2.tgz",
       "integrity": "sha512-HnSYx1BsJ87/p6swwzv+2v6B4X+uxUteoDfRxsAb1S1BePzQqOLevVmkdA15GHJVd9A9Ok6wygUR18Hu0YeV9g=="
     },
+    "eventemitter2": {
+      "version": "0.4.14",
+      "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz",
+      "integrity": "sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas=",
+      "dev": true
+    },
     "eventemitter3": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tor-router",
-  "version": "4.0.11",
+  "version": "4.0.12",
   "main": "src/index.js",
   "repository": "git@github.com:znetstar/tor-router.git",
   "author": "Zachary Boyd <zachary@zacharyboyd.nyc>",

src/launch.js

@@ -148,6 +148,7 @@ async function main(nconf, logger) {
 
     process.on('exit', cleanUp);
     process.on('SIGINT', cleanUp);
+    process.on('SIGTERM', cleanUp);
     process.on('uncaughtException', cleanUp.bind({ handleError: true }));
 }