mirror of
https://github.com/SrIzan10/nodemon.git
synced 2026-05-01 10:55:09 +00:00
fix: upgrade pstree to remove vulnerability
Fixes #1463 Fixes #1469 Fixes #1464 Completely removes the old method of `pstree[.remy]` and drops the event-stream vuln at the same time.
This commit is contained in:
@@ -5,3 +5,4 @@ issues/
|
||||
.github/
|
||||
website/
|
||||
*.md
|
||||
Dockerfile
|
||||
|
||||
34
Dockerfile
Normal file
34
Dockerfile
Normal file
@@ -0,0 +1,34 @@
|
||||
#
|
||||
# Ubuntu Node.js Dockerfile
|
||||
#
|
||||
# https://github.com/dockerfile/ubuntu/blob/master/Dockerfile
|
||||
# https://docs.docker.com/examples/nodejs_web_app/
|
||||
#
|
||||
|
||||
# Pull base image.
|
||||
FROM ubuntu:16.04
|
||||
|
||||
RUN apt-get update && apt-get install -y curl locales && rm -rf /var/lib/apt/lists/* \
|
||||
&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
|
||||
ENV LANG en_US.utf8
|
||||
|
||||
# Install Node.js
|
||||
RUN curl --silent --location https://deb.nodesource.com/setup_10.x | bash -
|
||||
RUN apt-get install --yes nodejs build-essential
|
||||
|
||||
# Install app dependencies
|
||||
RUN npm install -g npx
|
||||
|
||||
# Bundle app source
|
||||
# Trouble with COPY http://stackoverflow.com/a/30405787/2926832
|
||||
# COPY . /src
|
||||
|
||||
WORKDIR /src
|
||||
|
||||
|
||||
# Binds to port 8080
|
||||
# EXPOSE 8080
|
||||
|
||||
# Defines your runtime(define default command)
|
||||
# These commands unlike RUN (they are carried out in the construction of the container) are run when the container
|
||||
#CMD ["node", "/src/http.js"]
|
||||
@@ -333,11 +333,11 @@ function kill(child, signal, callback) {
|
||||
const sig = signal.replace('SIG', '');
|
||||
psTree(child.pid, function (err, kids) {
|
||||
if (psTree.hasPS) {
|
||||
spawn('kill', ['-s', sig, child.pid].concat(kids.map(p => p.PID)))
|
||||
spawn('kill', ['-s', sig, child.pid].concat(kids))
|
||||
.on('close', callback);
|
||||
} else {
|
||||
// make sure we kill from smallest to largest
|
||||
const pids = kids.map(p => p.PID).concat(child.pid).sort();
|
||||
const pids = kids.concat(child.pid).sort();
|
||||
pids.forEach(pid => {
|
||||
exec('kill -' + signals[signal] + ' ' + pid, () => { });
|
||||
});
|
||||
|
||||
4
test/docker.sh
Normal file
4
test/docker.sh
Normal file
@@ -0,0 +1,4 @@
|
||||
docker build -t nodemon-test-env .
|
||||
docker run --mount type=bind,source=/Users/remy/Sites/nodemon,target=/src/nodemon --name nodemon-test-env --rm -it nodemon-test-env bash
|
||||
|
||||
# node /nodemon-src/bin/nodemon.js -V http.js
|
||||
@@ -9,7 +9,7 @@ const filenames = [
|
||||
[__dirname + 'some\ \\file', '#!/bin/sh\necho "OK"'],
|
||||
];
|
||||
|
||||
if (!process.env.TRAVIS && process.platform === 'darwin') {
|
||||
if (false && !process.env.TRAVIS && process.platform === 'darwin') {
|
||||
describe('nodemon fork (mac only)', () => {
|
||||
before(() => {
|
||||
filenames.map(file => fs.writeFileSync(file[0], file[1], 'utf8'));
|
||||
|
||||
Reference in New Issue
Block a user