diff --git a/docker/docker-entrypoint b/docker/docker-entrypoint index e28ccd4..dfe4960 100755 --- a/docker/docker-entrypoint +++ b/docker/docker-entrypoint @@ -13,22 +13,6 @@ if [ "$(id -u)" -eq '0' ];then notice "$USER_ID, $GROUP_ID" usermod -u ${USER_ID} -g ${GROUP_ID} user > /dev/null 2>&1 chown -R ${USER_ID}:${GROUP_ID} /workspace > /dev/null 2>&1 - - if [ $ACTION_MODE!='true' ]; then - notice "非ACTION模式, 设置镜像源" - npm set registry https://r.npm.taobao.org # 注册模块镜像 - npm set disturl https://npm.taobao.org/dist # node-gyp 编译依赖的 node 源码镜像 - ## 以下选择添加 - npm set sass_binary_site https://npm.taobao.org/mirrors/node-sass # node-sass 二进制包镜像 - npm set electron_mirror https://npm.taobao.org/mirrors/electron/ # electron 二进制包镜像 - npm set puppeteer_download_host https://npm.taobao.org/mirrors # puppeteer 二进制包镜像 - npm set chromedriver_cdnurl https://npm.taobao.org/mirrors/chromedriver # chromedriver 二进制包镜像 - npm set operadriver_cdnurl https://npm.taobao.org/mirrors/operadriver # operadriver 二进制包镜像 - npm set phantomjs_cdnurl https://npm.taobao.org/mirrors/phantomjs # phantomjs 二进制包镜像 - npm set selenium_cdnurl https://npm.taobao.org/mirrors/selenium # selenium 二进制包镜像 - npm set node_inspector_cdnurl https://npm.taobao.org/mirrors/node-inspector # node-inspector 二进制包镜像 - # npm cache clean --force # 清空缓存 - fi # ls -l # cat /etc/passwd diff --git a/tools/rebuild-node-modules.sh b/tools/rebuild-node-modules.sh index fba738c..2759ca6 100755 --- a/tools/rebuild-node-modules.sh +++ b/tools/rebuild-node-modules.sh @@ -80,7 +80,6 @@ rm -fr "${package_dir}/node_modules_tmp/node_modules/spdlog-node" vscode-oniguruma \ vscode-ripgrep \ nodegit \ - --registry=https://registry.npm.taobao.org \ --nodegit_binary_host_mirror=https://npm.taobao.org/mirrors/nodegit/v0.27.0/) # reinstall modules # rebuild diff --git a/tools/setup-wechat-devtools-bash b/tools/setup-wechat-devtools-bash index 3795328..a1aaec4 100755 --- a/tools/setup-wechat-devtools-bash +++ b/tools/setup-wechat-devtools-bash @@ -10,15 +10,15 @@ catchError() { fi exit $exit_code } - success() { echo -e "\033[42;37m 成功 \033[0m $1" } - fail() { echo -e "\033[41;37m 失败 \033[0m $1" } - +notice() { + echo -e "\033[36m $1 \033[0m " +} root_dir=$(cd `dirname $0`/.. && pwd -P) @@ -37,9 +37,24 @@ if [ ! -f "$root_dir/node/bin/node" ]; then fi # 将node加入环境 export PATH="$root_dir/node/bin":$PATH +if [ $ACTION_MODE!='true' ]; then + notice "非ACTION模式, 设置镜像源" + npm set registry https://r.npm.taobao.org # 注册模块镜像 + npm set disturl https://npm.taobao.org/dist # node-gyp 编译依赖的 node 源码镜像 + ## 以下选择添加 + npm set sass_binary_site https://npm.taobao.org/mirrors/node-sass # node-sass 二进制包镜像 + npm set electron_mirror https://npm.taobao.org/mirrors/electron/ # electron 二进制包镜像 + npm set puppeteer_download_host https://npm.taobao.org/mirrors # puppeteer 二进制包镜像 + npm set chromedriver_cdnurl https://npm.taobao.org/mirrors/chromedriver # chromedriver 二进制包镜像 + npm set operadriver_cdnurl https://npm.taobao.org/mirrors/operadriver # operadriver 二进制包镜像 + npm set phantomjs_cdnurl https://npm.taobao.org/mirrors/phantomjs # phantomjs 二进制包镜像 + npm set selenium_cdnurl https://npm.taobao.org/mirrors/selenium # selenium 二进制包镜像 + npm set node_inspector_cdnurl https://npm.taobao.org/mirrors/node-inspector # node-inspector 二进制包镜像 + # npm cache clean --force # 清空缓存 +fi echo "=====安装node-gyp nw-gyp====" npm uninstall node-gyp -g -npm install node-gyp nw-gyp npm -g --registry=https://registry.npm.taobao.org +npm install node-gyp nw-gyp npm -g node-gyp install node-gyp list