From fbdbf525dfac2c9f2aceff3a12e09bdafa346278 Mon Sep 17 00:00:00 2001 From: Zachary Boyd Date: Thu, 21 Nov 2019 22:25:01 -0500 Subject: [PATCH 1/2] Added a entrypoint file so the node.js process is not the root process, so it responds to SIGINT calls (Ctrl+C). --- CHANGELOG.md | 4 ++++ Dockerfile | 6 ++++-- docker-entrypoint.sh | 3 +++ package-lock.json | 4 ++-- package.json | 2 +- src/launch.js | 1 + 6 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 docker-entrypoint.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index 94e9d1e..64feb75 100644 --- a/CHANGELOG.md +++ b/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. diff --git a/Dockerfile b/Dockerfile index 7b3b445..79b7857 100644 --- a/Dockerfile +++ b/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" ] \ No newline at end of file diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh new file mode 100644 index 0000000..6b448b4 --- /dev/null +++ b/docker-entrypoint.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +/app/bin/tor-router $@ \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 80bbc2f..0c0bf11 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "tor-router", - "version": "4.0.10", + "version": "4.0.11", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1887,7 +1887,7 @@ "from": "git+https://github.com/znetstar/node-dns.git#336f1d3027b2a3da719b5cd65380219267901aeb", "requires": { "ipaddr.js": "~0.1.3", - "native-dns-cache": "git+https://github.com/znetstar/native-dns-cache.git#7743c19bd1b70d0ec32a364aadc77fbcfd5a67ad", + "native-dns-cache": "git+https://github.com/znetstar/native-dns-cache.git", "native-dns-packet": "~0.1.1" } }, diff --git a/package.json b/package.json index 422f0ee..3725cd5 100644 --- a/package.json +++ b/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 ", diff --git a/src/launch.js b/src/launch.js index 1b136e6..eee966a 100644 --- a/src/launch.js +++ b/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 })); } From bf0327ad66b9470a0607d5b4cd215f4d65ea626b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2019 03:26:08 +0000 Subject: [PATCH 2/2] Bump merge from 1.2.0 to 1.2.1 Bumps [merge](https://github.com/yeikos/js.merge) from 1.2.0 to 1.2.1. - [Release notes](https://github.com/yeikos/js.merge/releases) - [Commits](https://github.com/yeikos/js.merge/compare/v1.2.0...v1.2.1) Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0c0bf11..65f3954 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "tor-router", - "version": "4.0.11", + "version": "4.0.12", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -735,7 +735,7 @@ }, "eventemitter2": { "version": "0.4.14", - "resolved": "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz", + "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz", "integrity": "sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas=", "dev": true }, @@ -1644,16 +1644,16 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true } } }, "merge": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz", - "integrity": "sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz", + "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==" }, "mime-db": { "version": "1.36.0",