diff --git a/backend/scripts/install-nodejs.sh b/backend/scripts/install-nodejs.sh index 129bbc44..72f5952c 100644 --- a/backend/scripts/install-nodejs.sh +++ b/backend/scripts/install-nodejs.sh @@ -6,23 +6,9 @@ touch /tmp/install.lock # lock touch /tmp/install-nodejs.lock -# install nvm -BASE_DIR=`dirname $0` -/bin/bash ${BASE_DIR}/install-nvm.sh -export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm - -# install Node.js v10.19 -export NVM_NODEJS_ORG_MIRROR=http://npm.taobao.org/mirrors/node -nvm install 10.19 - -# create soft links -ln -s $HOME/.nvm/versions/node/v10.19.0/bin/npm /usr/local/bin/npm -ln -s $HOME/.nvm/versions/node/v10.19.0/bin/node /usr/local/bin/node - -# environments manipulation -export NODE_PATH=$HOME.nvm/versions/node/v10.19.0/lib/node_modules -export PATH=$NODE_PATH:$PATH +# install node.js +curl -sL https://deb.nodesource.com/setup_10.x | bash - +apt install -y nodejs # install chromium # See https://crbug.com/795759 diff --git a/backend/services/task.go b/backend/services/task.go index f553dea0..905bb6a7 100644 --- a/backend/services/task.go +++ b/backend/services/task.go @@ -23,7 +23,6 @@ import ( "net/http" "os" "os/exec" - "path" "path/filepath" "runtime" "runtime/debug" @@ -116,9 +115,7 @@ func AssignTask(task model.Task) error { func SetEnv(cmd *exec.Cmd, envs []model.Env, task model.Task, spider model.Spider) *exec.Cmd { // 默认把Node.js的全局node_modules加入环境变量 envPath := os.Getenv("PATH") - homePath := os.Getenv("HOME") - nodeVersion := "v10.19.0" - nodePath := path.Join(homePath, ".nvm/versions/node", nodeVersion, "lib/node_modules") + nodePath := "/usr/lib/node_modules" if !strings.Contains(envPath, nodePath) { _ = os.Setenv("PATH", nodePath+":"+envPath) }