diff --git a/docker/Dockerfile b/docker/Dockerfile index 4533aedfbbabe2b32aa293620286ec2c12f0a803..11804a9725d66f8bfed06a9583cccd09bd085430 100755 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -46,7 +46,7 @@ RUN sed -i "/wait ${proxy_pid}/i if [ -n \"\$VNC_PASSWORD\" ]; then sed -i \"s/W RUN sed -i "/wait ${proxy_pid}/i if [ -n \"\$VIEW_ONLY\" ]; then sed -i \"s/UI.rfb.viewOnly = UI.getSetting('view_only');/UI.rfb.viewOnly = \$VIEW_ONLY;/\" /checkchan/noVNC/app/ui.js; fi" /checkchan/noVNC/utils/novnc_proxy RUN sed -i -- "s/ps -p/ps -o pid | grep/g" /checkchan/noVNC/utils/novnc_proxy -RUN npm install -g pm2 ts-node typescript '@types/node' nodemon +RUN npm install -g pm2 ts-node typescript '@types/node' nodemon axios cheerio COPY api /checkchan/api RUN cd /checkchan/api/ && npm install diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev index 61d41204c73274ce0e14174e61338579343c4320..e8235f5e98111a0f719563dd867a98b37aad9db8 100644 --- a/docker/Dockerfile.dev +++ b/docker/Dockerfile.dev @@ -40,7 +40,7 @@ RUN sed -i "/wait ${proxy_pid}/i if [ -n \"\$VNC_PASSWORD\" ]; then sed -i \"s/W RUN sed -i "/wait ${proxy_pid}/i if [ -n \"\$VIEW_ONLY\" ]; then sed -i \"s/UI.rfb.viewOnly = UI.getSetting('view_only');/UI.rfb.viewOnly = \$VIEW_ONLY;/\" /checkchan/noVNC/app/ui.js; fi" /checkchan/noVNC/utils/novnc_proxy RUN sed -i -- "s/ps -p/ps -o pid | grep/g" /checkchan/noVNC/utils/novnc_proxy -RUN npm install -g pm2 ts-node typescript '@types/node' nodemon +RUN npm install -g pm2 ts-node typescript '@types/node' nodemon axios cheerio # COPY api /checkchan/api # RUN cd /checkchan/api/ && npm install diff --git a/docker/api/func.js b/docker/api/func.js index 60b54b50001ee999df2c2bd5a17fd918f3232594..cd45189d2c447c43981013b09ba7340e220424e2 100755 --- a/docker/api/func.js +++ b/docker/api/func.js @@ -455,6 +455,7 @@ async function monitor_shell(item, cookies) const result = await spawnAsync( command, [shell_file], { env: { 'URL':compile_url(url), + 'NODE_PATH':'/usr/local/lib/node_modules', [cookie_name]:cookie_string, ...process.env, }