Merge branch 'master' into upstream_master
This commit is contained in:
commit
c1b7a124c4
|
@ -1,5 +1,9 @@
|
||||||
# Changelog
|
# 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
|
## [4.0.11] - 2019-01-15
|
||||||
### Changed
|
### Changed
|
||||||
- Updates `multi-rpc` to version 1.5.5.
|
- Updates `multi-rpc` to version 1.5.5.
|
||||||
|
|
|
@ -20,7 +20,9 @@ USER tor_router
|
||||||
|
|
||||||
ADD package.json /app/package.json
|
ADD package.json /app/package.json
|
||||||
|
|
||||||
RUN npm install
|
ADD package-lock.json /app/package-lock.json
|
||||||
|
|
||||||
|
RUN npm ci
|
||||||
|
|
||||||
ADD . /app
|
ADD . /app
|
||||||
|
|
||||||
|
@ -28,6 +30,6 @@ ENV HOME /home/tor_router
|
||||||
|
|
||||||
EXPOSE 9050 9053 9077
|
EXPOSE 9050 9053 9077
|
||||||
|
|
||||||
ENTRYPOINT [ "tor-router" ]
|
ENTRYPOINT [ "/bin/bash", "/app/docker-entrypoint.sh" ]
|
||||||
|
|
||||||
CMD [ "-s", "-d", "-j", "1" ]
|
CMD [ "-s", "-d", "-j", "1" ]
|
3
docker-entrypoint.sh
Normal file
3
docker-entrypoint.sh
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
/app/bin/tor-router $@
|
8
package-lock.json
generated
8
package-lock.json
generated
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "tor-router",
|
"name": "tor-router",
|
||||||
"version": "4.0.11",
|
"version": "4.0.12",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -724,6 +724,12 @@
|
||||||
"resolved": "https://registry.npmjs.org/event-lite/-/event-lite-0.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/event-lite/-/event-lite-0.1.2.tgz",
|
||||||
"integrity": "sha512-HnSYx1BsJ87/p6swwzv+2v6B4X+uxUteoDfRxsAb1S1BePzQqOLevVmkdA15GHJVd9A9Ok6wygUR18Hu0YeV9g=="
|
"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": {
|
"eventemitter3": {
|
||||||
"version": "3.1.2",
|
"version": "3.1.2",
|
||||||
"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "tor-router",
|
"name": "tor-router",
|
||||||
"version": "4.0.11",
|
"version": "4.0.12",
|
||||||
"main": "src/index.js",
|
"main": "src/index.js",
|
||||||
"repository": "git@github.com:znetstar/tor-router.git",
|
"repository": "git@github.com:znetstar/tor-router.git",
|
||||||
"author": "Zachary Boyd <zachary@zacharyboyd.nyc>",
|
"author": "Zachary Boyd <zachary@zacharyboyd.nyc>",
|
||||||
|
|
|
@ -148,6 +148,7 @@ async function main(nconf, logger) {
|
||||||
|
|
||||||
process.on('exit', cleanUp);
|
process.on('exit', cleanUp);
|
||||||
process.on('SIGINT', cleanUp);
|
process.on('SIGINT', cleanUp);
|
||||||
|
process.on('SIGTERM', cleanUp);
|
||||||
process.on('uncaughtException', cleanUp.bind({ handleError: true }));
|
process.on('uncaughtException', cleanUp.bind({ handleError: true }));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue