Merge branch 'node-red:master' into master

Author: hardillb

.docker/Dockerfile.alpine

@@ -82,6 +82,7 @@ RUN chown -R node-red:root /usr/src/node-red && \
     rm -r /tmp/*
 
 RUN npm config set cache /data/.npm --global
+RUN npm config set python `which python3` --global
 
 USER node-red
 

docker-custom/Dockerfile.custom

@@ -80,6 +80,7 @@ RUN chown -R node-red:root /usr/src/node-red && \
     rm -r /tmp/*
 
 RUN npm config set cache /data/.npm --global 
+RUN npm config set python `which python3` --global
 
 USER node-red
 

docker-custom/Dockerfile.debian

@@ -81,6 +81,7 @@ RUN chown -R node-red:root /usr/src/node-red && \
     rm -r /tmp/*
 
 RUN npm config set cache /data/.npm --global
+RUN npm config set python `which python3` --global
 
 USER node-red
 

docker-custom/scripts/entrypoint.sh

@@ -7,8 +7,8 @@ function stop() {
 	wait $CHILD_PID
 }
 
-/usr/local/bin/node $NODEOPTIONS node_modules/node-red/red.js --userDir /data $FLOWS &
+/usr/local/bin/node $NODE_OPTIONS node_modules/node-red/red.js --userDir /data $FLOWS &
 
 CHILD_PID="$!"
 
-wait "${CHILD_PID}"
+wait "${CHILD_PID}"